Merge branch 'static' into 'main'

tests: skip shared libs if default_library=static

See merge request GNOME/glib!2867

gio/tests/meson.build

@@ -227,7 +227,7 @@ if host_machine.system() != 'windows'
   }
 
   # LD_PRELOAD modules don't work so well with AddressSanitizer
-  if have_rtld_next and get_option('b_sanitize') == 'none'
+  if have_rtld_next and get_option('default_library') != 'static' and get_option('b_sanitize') == 'none'
     gio_tests += {
       'gsocketclient-slow' : {
         'depends' : [
@@ -656,6 +656,7 @@ if meson.can_run_host_binaries()
 
   compiler_type = '--compiler=@0@'.format(cc.get_id())
 
+  if get_option('default_library') != 'static'
     plugin_resources_c = custom_target('plugin-resources.c',
       input : 'test4.gresource.xml',
       output : 'plugin-resources.c',
@@ -675,6 +676,7 @@ if meson.can_run_host_binaries()
       install_tag : 'tests',
       install : installed_tests_enabled
     )
+  endif
 
   # referenced by test2.gresource.xml
   big_test_resource = custom_target(
@@ -976,4 +978,7 @@ if installed_tests_enabled
 endif
 
 subdir('services')
+
+if get_option('default_library') != 'static'
   subdir('modules')
+endif

glib/tests/meson.build

@@ -204,7 +204,7 @@ else
     'include' : {},
     'unix' : {},
   }
-  if have_rtld_next
+  if have_rtld_next and get_option('default_library') != 'static'
     glib_tests += {
       'gutils-user-database' : {
         'depends' : [

gmodule/tests/meson.build

@@ -37,6 +37,7 @@ if ['darwin', 'ios'].contains(host_machine.system())
   module_suffix = 'so'
 endif
 
+if get_option('default_library') != 'static'
   foreach module : ['moduletestplugin_a', 'moduletestplugin_b']
     shared_module(module + '_plugin', 'lib@0@.c'.format(module),
       dependencies : [libglib_dep, libgmodule_dep],
@@ -53,6 +54,7 @@ foreach module : ['moduletestplugin_a', 'moduletestplugin_b']
       name_suffix : module_suffix
     )
   endforeach
+endif
 
 test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())