diff options
| -rwxr-xr-x | run_project_tests.py | 3 | ||||
| -rw-r--r-- | test cases/common/207 install name_prefix name_suffix/installed_files.txt | 5 | ||||
| -rw-r--r-- | test cases/common/207 install name_prefix name_suffix/meson.build | 3 |
3 files changed, 11 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) diff --git a/test cases/common/207 install name_prefix name_suffix/installed_files.txt b/test cases/common/207 install name_prefix name_suffix/installed_files.txt index d590591c4..240a8be69 100644 --- a/test cases/common/207 install name_prefix name_suffix/installed_files.txt +++ b/test cases/common/207 install name_prefix name_suffix/installed_files.txt @@ -1,9 +1,14 @@ ?msvc:usr/bin/baz.pdb +?msvc:usr/bin/bowcorge.pdb ?msvc:usr/bin/foo.pdb ?msvc:usr/lib/baz.pdb +?msvc:usr/lib/bowcorge.pdb ?msvc:usr/lib/foo.pdb +usr/?lib/bowcorge.stern usr/lib/?libbaz.cheese usr/lib/bar.a +usr/lib/bowcorge?implib +usr/lib/bowgrault.stern usr/lib/foo?implib usr/lib/foo?so usr/lib/libbaz?implib diff --git a/test cases/common/207 install name_prefix name_suffix/meson.build b/test cases/common/207 install name_prefix name_suffix/meson.build index 1ae98b6e9..4539999d9 100644 --- a/test cases/common/207 install name_prefix name_suffix/meson.build +++ b/test cases/common/207 install name_prefix name_suffix/meson.build @@ -5,3 +5,6 @@ static_library('bar', 'libfile.c', name_prefix: '', install : true) shared_library('baz', 'libfile.c', name_suffix: 'cheese', install : true) static_library('qux', 'libfile.c', name_suffix: 'cheese', install : true) + +shared_library('corge', 'libfile.c', name_prefix: 'bow', name_suffix: 'stern', install : true) +static_library('grault', 'libfile.c', name_prefix: 'bow', name_suffix: 'stern', install : true) |