diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2020-06-26 10:52:51 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-11-21 07:55:10 -0800 |
| commit | 9dab27f814cb3d9abe0a7617b9a7a64efb0938e3 (patch) | |
| tree | 9b696e2862a794aaeed9533c2085425ac9cf70ef | |
| parent | ea416591a9b8c922b7a52723a44f7f26311f2ebc (diff) | |
| download | meson-9dab27f814cb3d9abe0a7617b9a7a64efb0938e3.zip meson-9dab27f814cb3d9abe0a7617b9a7a64efb0938e3.tar.gz meson-9dab27f814cb3d9abe0a7617b9a7a64efb0938e3.tar.bz2 | |
run_project_tests: Use the test environment for install and clean
| -rwxr-xr-x | run_project_tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 8bf6437..979382a 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -619,7 +619,7 @@ def _run_test(test: TestDef, test_build_dir: str, install_dir: str, extra_args, # Do installation, if the backend supports it if install_commands: - env = os.environ.copy() + env = test.env.copy() env['DESTDIR'] = install_dir # Install with subprocess pi, o, e = Popen_safe(install_commands, cwd=test_build_dir, env=env) @@ -629,7 +629,7 @@ def _run_test(test: TestDef, test_build_dir: str, install_dir: str, extra_args, return testresult # Clean with subprocess - env = os.environ.copy() + env = test.env.copy() pi, o, e = Popen_safe(clean_commands + dir_args, cwd=test_build_dir, env=env) testresult.add_step(BuildStep.clean, o, e) if pi.returncode != 0: |