luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'static' into 'main'

Browse Source 
tests: skip shared libs if default_library=static

See merge request GNOME/glib!2867
This commit is contained in:
Philip Withnall 2022-10-12 16:19:02 +00:00
commit c16f524034
3 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/tests/meson.build
View File

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

2
glib/tests/meson.build
View File

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

2
gmodule/tests/meson.build
View File

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