Extend test to when both name_{suf,pre}fix: are used

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)
 

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

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)