diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-03 20:41:00 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-06 13:17:21 +0000 |
| commit | 5d51329d270fa7dcaf3140abe98d5cccaab80bfe (patch) | |
| tree | 719e7acb1facb97c6c4e1e71af56734155c0e49c /run_project_tests.py | |
| parent | e64a9c98307a62a830aaa209612c94a7bdff9833 (diff) | |
| download | meson-5d51329d270fa7dcaf3140abe98d5cccaab80bfe.tar.gz | |
Extend test to when both name_{suf,pre}fix: are used
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 6f7d9d77e..234f97eb5 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -121,13 +121,16 @@ def platform_fix_name(fname, compiler, env): if '?lib' in fname: if mesonlib.for_windows(env.is_cross_build(), env) and compiler == 'msvc': fname = re.sub(r'lib/\?lib(.*)\.', r'bin/\1.', fname) + fname = re.sub(r'/\?lib/', r'/bin/', fname) elif mesonlib.for_windows(env.is_cross_build(), env): fname = re.sub(r'lib/\?lib(.*)\.', r'bin/lib\1.', fname) fname = re.sub(r'\?lib(.*)\.dll$', r'lib\1.dll', fname) + fname = re.sub(r'/\?lib/', r'/bin/', fname) elif mesonlib.for_cygwin(env.is_cross_build(), env): fname = re.sub(r'lib/\?lib(.*)\.so$', r'bin/cyg\1.dll', fname) fname = re.sub(r'lib/\?lib(.*)\.', r'bin/cyg\1.', fname) fname = re.sub(r'\?lib(.*)\.dll$', r'cyg\1.dll', fname) + fname = re.sub(r'/\?lib/', r'/bin/', fname) else: fname = re.sub(r'\?lib', 'lib', fname) |