diff options
| -rwxr-xr-x | run_tests.py | 5 | ||||
| -rw-r--r-- | unittests/internaltests.py | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/run_tests.py b/run_tests.py index 4e22028b8..6ca84f07f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -135,10 +135,6 @@ class FakeBuild: def __init__(self, env): self.environment = env -class FakeCompilerOptions: - def __init__(self): - self.value = [] - def get_fake_options(prefix: str = '') -> SharedCMDOptions: opts = T.cast('SharedCMDOptions', argparse.Namespace()) opts.native_file = [] @@ -153,7 +149,6 @@ def get_fake_env(sdir: str = '', bdir: T.Optional[str] = None, prefix: str = '', if opts is None: opts = get_fake_options(prefix) env = Environment(sdir, bdir, opts) - env.coredata.optstore.set_value_object(OptionKey('c_args'), FakeCompilerOptions()) env.machines.host.cpu_family = 'x86_64' # Used on macOS inside find_library # Invalidate cache when using a different Environment object. clear_meson_configure_class_caches() diff --git a/unittests/internaltests.py b/unittests/internaltests.py index d803f0479..e8742eb2e 100644 --- a/unittests/internaltests.py +++ b/unittests/internaltests.py @@ -44,10 +44,7 @@ from mesonbuild.programs import ExternalProgram import mesonbuild.modules.pkgconfig from mesonbuild import utils - -from run_tests import ( - FakeCompilerOptions, get_fake_env, get_fake_options -) +from run_tests import get_fake_env, get_fake_options from .helpers import * @@ -629,7 +626,6 @@ class InternalTests(unittest.TestCase): env = get_fake_env() compiler = detect_c_compiler(env, MachineChoice.HOST) env.coredata.compilers.host = {'c': compiler} - env.coredata.optstore.set_value_object(OptionKey('c_link_args'), FakeCompilerOptions()) p1 = Path(tmpdir) / '1' p2 = Path(tmpdir) / '2' p1.mkdir() |