diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-08-06 14:35:25 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-08-23 11:33:39 -0400 |
| commit | 18b96cd0692255b30f8f0597cbf4af89d142a93d (patch) | |
| tree | b2edf3ee61fb7b1fef7f0e697c7288923f434a51 /run_project_tests.py | |
| parent | bde690b06e930020a0ec6ccaea7a76babf77dff5 (diff) | |
| download | meson-18b96cd0692255b30f8f0597cbf4af89d142a93d.tar.gz | |
machine file: Add @GLOBAL_SOURCE_ROOT@ and @DIRNAME@
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index acfa284d7..f27933261 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -793,7 +793,7 @@ def _skip_keys(test_def: T.Dict) -> T.Tuple[bool, bool]: # Test is expected to skip if os matches if 'skip_on_os' in test_def: - mesonenv = environment.Environment(None, None, get_fake_options('/')) + mesonenv = environment.Environment('', '', get_fake_options('/')) for skip_os in test_def['skip_on_os']: if skip_os.startswith('!'): if mesonenv.machines.host.system != skip_os[1:]: @@ -966,7 +966,7 @@ def have_d_compiler() -> bool: def have_objc_compiler(use_tmp: bool) -> bool: with TemporaryDirectoryWinProof(prefix='b ', dir=None if use_tmp else '.') as build_dir: - env = environment.Environment(None, build_dir, get_fake_options('/')) + env = environment.Environment('', build_dir, get_fake_options('/')) try: objc_comp = detect_objc_compiler(env, MachineChoice.HOST) except mesonlib.MesonException: @@ -982,7 +982,7 @@ def have_objc_compiler(use_tmp: bool) -> bool: def have_objcpp_compiler(use_tmp: bool) -> bool: with TemporaryDirectoryWinProof(prefix='b ', dir=None if use_tmp else '.') as build_dir: - env = environment.Environment(None, build_dir, get_fake_options('/')) + env = environment.Environment('', build_dir, get_fake_options('/')) try: objcpp_comp = detect_objcpp_compiler(env, MachineChoice.HOST) except mesonlib.MesonException: @@ -1458,7 +1458,7 @@ def detect_system_compiler(options: 'CompilerArgumentType') -> None: if options.native_file: fake_opts.native_file = [options.native_file] - env = environment.Environment(None, None, fake_opts) + env = environment.Environment('', '', fake_opts) print_compilers(env, MachineChoice.HOST) if options.cross_file: |