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

Merge branch 'backport-776-external-data-test-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !776 “tests: Only run --external-data test on GNU ld/objcopy” to glib-2-60

See merge request GNOME/glib!778
This commit is contained in:
Emmanuele Bassi 2019-04-15 09:42:15 +00:00
commit 084f639c28
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gio/tests/meson.build
View File

@ -551,9 +551,21 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
copy : true, copy : true,
install : false) install : false)
# Create object file containing resource data resources_extra_sources = [
# for testing the external data option test_gresource,
if build_machine.system() == 'linux' test_resources_c,
test_resources2_c,
test_resources2_h,
digit_test_resources_c,
digit_test_resources_h,
]
# Create object file containing resource data for testing the --external-data
# option. Currently only GNU ld and GNU objcopy support the right options.
# Support for --add-symbol was added to LLVM objcopy in 2019
# (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for
# LLVM once that support is in a stable release.
if build_machine.system() == 'linux' and cc.get_id() == 'gcc'
test_gresource_binary = custom_target('test5.gresource', test_gresource_binary = custom_target('test5.gresource',
input : 'test5.gresource.xml', input : 'test5.gresource.xml',
output : 'test5.gresource', output : 'test5.gresource',
@ -597,21 +609,17 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'@INPUT@', '@INPUT@',
'@OUTPUT@']) '@OUTPUT@'])
gio_tests += { resources_extra_sources += [
'resources' : { test_resources_binary_c,
'extra_sources' : [test_gresource, test_resources_c, test_resources2_c, test_resources_binary2,
test_resources2_h, test_resources_binary_c, ]
test_resources_binary2, digit_test_resources_c, digit_test_resources_h],
},
}
else
gio_tests += {
'resources' : {
'extra_sources' : [test_gresource, test_resources_c, test_resources2_c,
test_resources2_h, digit_test_resources_c, digit_test_resources_h],
},
}
endif endif
gio_tests += {
'resources' : {
'extra_sources' : resources_extra_sources,
},
}
endif endif
foreach test_name, extra_args : gio_tests foreach test_name, extra_args : gio_tests