From ed013f95500eeeefb57f86b4a5e82a80009b84ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 25 Oct 2022 18:45:46 +0200 Subject: [PATCH] gio/tests/meson: Make giomodule test to depend on built modules These are loaded dynamically so we need to ensure they're available at test time --- gio/tests/meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index be23bc525..1734d96d4 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -42,6 +42,10 @@ giotypefuncs_inc = custom_target( input : gio_headers + [gioenumtypes_h] + gobject_install_headers, command: [gengiotypefuncs_prog, '@OUTPUT@', '@INPUT@']) +if glib_build_shared + subdir('modules') +endif + # Test programs buildable on all platforms gio_tests = { 'appmonitor' : { @@ -66,7 +70,9 @@ gio_tests = { 'file-thumbnail' : {}, 'fileattributematcher' : {}, 'filter-streams' : {}, - 'giomodule' : {}, + 'giomodule' : { + 'depends' : glib_build_shared ? [libtestmodulea, libtestmoduleb] : [], + }, 'gsubprocess' : { 'suite': host_system == 'windows' ? ['flaky'] : [], 'extra_programs': ['gsubprocess-testprog'], @@ -1037,7 +1043,3 @@ if installed_tests_enabled endif subdir('services') - -if glib_build_shared - subdir('modules') -endif