diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-09-08 14:58:13 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-12 20:28:42 +0300 |
| commit | b04c4fa878d9a1fc3ca9f7b6e4c613735d871476 (patch) | |
| tree | 031f3cc3e6db5c564519f5a60e4938d673010777 /mesonbuild/mtest.py | |
| parent | e1fc17ef2a532d539678b9a9378bca59eda38a91 (diff) | |
| download | meson-b04c4fa878d9a1fc3ca9f7b6e4c613735d871476.zip meson-b04c4fa878d9a1fc3ca9f7b6e4c613735d871476.tar.gz meson-b04c4fa878d9a1fc3ca9f7b6e4c613735d871476.tar.bz2 | |
Add Windows extra_paths to beginning of PATH when running tests
Adding it to the end of PATH means that if an installed instance of a DLL
exists, that would be used instead of the built instance.
Compare with run_exe(), which already gets this right.
Diffstat (limited to 'mesonbuild/mtest.py')
| -rw-r--r-- | mesonbuild/mtest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 2520ae8..6a0cc25 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -224,7 +224,7 @@ class TestHarness: child_env.update(test.env) if len(test.extra_paths) > 0: - child_env['PATH'] += os.pathsep.join([''] + test.extra_paths) + child_env['PATH'] = os.pathsep.join(test.extra_paths + ['']) + child_env['PATH'] # If MALLOC_PERTURB_ is not set, or if it is set to an empty value, # (i.e., the test or the environment don't explicitly set it), set |