luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gio-test-dependencies' into 'main'

Browse Source 
tests: Fix dependency of test.gresource on test-generated.txt

See merge request GNOME/glib!3682
This commit is contained in:
Marco Trevisan 2023-11-01 14:55:25 +00:00
commit d1fcb4f253
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/tests/meson.build
View File

@ -810,8 +810,12 @@ if not meson.is_cross_build()
output : ['gresource-big-test.txt'], output : ['gresource-big-test.txt'],
command : [python, '@INPUT0@', '@OUTPUT@']) command : [python, '@INPUT0@', '@OUTPUT@'])
# referenced by test.gresource.xml
test_generated_txt = fs.copyfile('test1.txt', 'test-generated.txt')
test_gresource = custom_target('test.gresource', test_gresource = custom_target('test.gresource',
input : 'test.gresource.xml', input : 'test.gresource.xml',
depends : test_generated_txt,
output : 'test.gresource', output : 'test.gresource',
command : [glib_compile_resources, command : [glib_compile_resources,
compiler_type, compiler_type,
@ -889,9 +893,6 @@ if not meson.is_cross_build()
'--manual-register', '--manual-register',
'@INPUT@']) '@INPUT@'])
# referenced by test.gresource.xml
test_generated_txt = fs.copyfile('test1.txt', 'test-generated.txt')
resources_extra_sources = [ resources_extra_sources = [
test_gresource, test_gresource,
test_resources_c, test_resources_c,
@ -982,7 +983,7 @@ if not meson.is_cross_build()
gio_tests += { gio_tests += {
'resources' : { 'resources' : {
'extra_sources' : resources_extra_sources, 'extra_sources' : resources_extra_sources,
'depends' : [resource_plugin, test_generated_txt], 'depends' : resource_plugin,
}, },
} }
endif endif