test cases/rust: adjust expected installed paths for shared libraries

Make sure that they are checked against the correct extension
on Darwin.

Fixes: #7964
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

6 files changed, 13 insertions, 30 deletions

diff --git a/test cases/rust/13 external c dependencies/meson.build b/test cases/rust/13 external c dependencies/meson.build
index d0baab42d..ff1136b2e 100644
--- a/test cases/rust/13 external c dependencies/meson.build
+++ b/test cases/rust/13 external c dependencies/meson.build
@@ -1,9 +1,5 @@
 project('rust linking to c using dependency', 'c', 'rust')
 
-if host_machine.system() == 'darwin'
-  error('MESON_SKIP_TEST: does not work right on macos, please fix!')
-endif
-
 dep_zlib = dependency('zlib', static : get_option('static'), method : get_option('method'), required : false)
 if not dep_zlib.found()
   error('MESON_SKIP_TEST: Could not find a @0@ zlib'.format(get_option('static') ? 'static' : 'shared'))
diff --git a/test cases/rust/14 external libm/meson.build b/test cases/rust/14 external libm/meson.build
index e42eefeca..e8c016782 100644
--- a/test cases/rust/14 external libm/meson.build
+++ b/test cases/rust/14 external libm/meson.build
@@ -1,9 +1,5 @@
 project('rust linking to libm', 'c', 'rust')
 
-if host_machine.system() == 'darwin'
-  error('MESON_SKIP_TEST: does not work right on macos, please fix!')
-endif
-
 cc = meson.get_compiler('c')
 dep_m = cc.find_library('m', required : false, static : get_option('static'))
 if not dep_m.found()
diff --git a/test cases/rust/2 sharedlib/meson.build b/test cases/rust/2 sharedlib/meson.build
index 295fa0497..2380cce8f 100644
--- a/test cases/rust/2 sharedlib/meson.build
+++ b/test cases/rust/2 sharedlib/meson.build
@@ -1,9 +1,5 @@
 project('rust shared library', 'rust', 'c')
 
-if host_machine.system() == 'darwin'
-  error('MESON_SKIP_TEST: does not work right on macos, please fix!')
-endif
-
 s = static_library('static', 'value.c')
 l = shared_library('stuff', 'stuff.rs', link_whole : s, install : true)
 e = executable('prog', 'prog.rs', link_with : l, install : true)
diff --git a/test cases/rust/2 sharedlib/test.json b/test cases/rust/2 sharedlib/test.json
index 585fdeb69..11c7f9dbe 100644
--- a/test cases/rust/2 sharedlib/test.json
+++ b/test cases/rust/2 sharedlib/test.json
@@ -2,7 +2,7 @@
   "installed": [
     {"type": "exe", "file": "usr/bin/prog"},
     {"type": "pdb", "file": "usr/bin/prog"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff.dll"},
     {"type": "pdb", "file": "usr/bin/stuff"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff.dll.lib"}
diff --git a/test cases/rust/4 polyglot/meson.build b/test cases/rust/4 polyglot/meson.build
index b2fd8f913..97b7bcdb7 100644
--- a/test cases/rust/4 polyglot/meson.build
+++ b/test cases/rust/4 polyglot/meson.build
@@ -1,9 +1,5 @@
 project('rust and c polyglot executable', 'c', 'rust')
 
-if host_machine.system() == 'darwin'
-  error('MESON_SKIP_TEST: does not work right on macos, please fix!')
-endif
-
 cc = meson.get_compiler('c')
 
 # Test all combinations of crate and target types.
diff --git a/test cases/rust/4 polyglot/test.json b/test cases/rust/4 polyglot/test.json
index d963ad840..443bf6c4a 100644
--- a/test cases/rust/4 polyglot/test.json
+++ b/test cases/rust/4 polyglot/test.json
@@ -3,7 +3,7 @@
     {"type": "exe", "file": "usr/bin/prog-stuff_clib_both_libraries"},
     {"type": "pdb", "file": "usr/bin/prog-stuff_clib_both_libraries"},
     {"type": "pdb",  "file": "usr/bin/stuff_clib_both_libraries.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_clib_both_libraries.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_clib_both_libraries"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_clib_both_libraries.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_clib_both_libraries.dll.lib"},
     {"type": "file", "file": "usr/lib/libstuff_clib_both_libraries.a"},
@@ -11,7 +11,7 @@
     {"type": "exe", "file": "usr/bin/prog-stuff_clib_shared_library"},
     {"type": "pdb", "file": "usr/bin/prog-stuff_clib_shared_library"},
     {"type": "pdb",  "file": "usr/bin/stuff_clib_shared_library.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_clib_shared_library.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_clib_shared_library"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_clib_shared_library.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_clib_shared_library.dll.lib"},
 
@@ -22,7 +22,7 @@
     {"type": "exe", "file": "usr/bin/prog-stuff_cdylib_shared_library"},
     {"type": "pdb", "file": "usr/bin/prog-stuff_cdylib_shared_library"},
     {"type": "pdb",  "file": "usr/bin/stuff_cdylib_shared_library.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_cdylib_shared_library.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_cdylib_shared_library"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_cdylib_shared_library.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_cdylib_shared_library.dll.lib"},
 
@@ -31,7 +31,7 @@
     {"type": "file", "file": "usr/lib/libstuff_staticlib_static_library.a"},
 
     {"type": "pdb",  "file": "usr/bin/stuff__both_libraries.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff__both_libraries.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff__both_libraries"},
     {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff__both_libraries.rlib"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/libstuff__both_libraries.rlib"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff__both_libraries.dll"},
@@ -41,13 +41,13 @@
     {"type": "file", "platform": "msvc", "file": "usr/lib/libstuff__static_library.rlib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_proc_macro_shared_library.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_proc_macro_shared_library.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_proc_macro_shared_library"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_proc_macro_shared_library.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_proc_macro_shared_library.dll.lib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_lib_both_libraries.pdb"},
     {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_lib_both_libraries.rlib"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_lib_both_libraries.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_lib_both_libraries"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_lib_both_libraries.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/libstuff_lib_both_libraries.rlib"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_lib_both_libraries.dll.lib"},
@@ -59,33 +59,32 @@
     {"type": "file", "platform": "msvc", "file": "usr/lib/libstuff_lib_static_library.rlib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff__shared_library.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff__shared_library.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff__shared_library"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff__shared_library.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff__shared_library.dll.lib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_lib_shared_library.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_lib_shared_library.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_lib_shared_library"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_lib_shared_library.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_lib_shared_library.dll.lib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_dylib_shared_library.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_dylib_shared_library.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_dylib_shared_library"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_dylib_shared_library.dll.lib"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_dylib_shared_library.dll"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_cdylib_both_libraries.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_cdylib_both_libraries.so"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_cdylib_both_libraries.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_cdylib_both_libraries"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_cdylib_both_libraries.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_cdylib_both_libraries.dll.lib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_proc_macro_both_libraries.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_proc_macro_both_libraries.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_proc_macro_both_libraries"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_proc_macro_both_libraries.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_proc_macro_both_libraries.dll.lib"},
 
     {"type": "pdb",  "file": "usr/bin/stuff_dylib_both_libraries.pdb"},
-    {"type": "file", "platform": "gcc", "file": "usr/lib/libstuff_dylib_both_libraries.so"},
+    {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/stuff_dylib_both_libraries"},
     {"type": "file", "platform": "msvc", "file": "usr/bin/stuff_dylib_both_libraries.dll"},
     {"type": "file", "platform": "msvc", "file": "usr/lib/stuff_dylib_both_libraries.dll.lib"}
   ]