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

Merge branch '1709-resource-llvm' into 'master'

Browse Source 
tests: Only run --external-data test on GNU ld/objcopy

Closes #1711 and #1709

See merge request GNOME/glib!776
This commit is contained in:
Emmanuele Bassi 2019-04-12 18:30:55 +00:00
commit 14e90e34a4
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gio/tests/meson.build
View File

@ -557,9 +557,21 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
copy : true,
install : false)
# Create object file containing resource data
# for testing the external data option
if build_machine.system() == 'linux'
resources_extra_sources = [
test_gresource,
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',
input : 'test5.gresource.xml',
output : 'test5.gresource',
@ -571,7 +583,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
install_dir : installed_tests_execdir,
install : installed_tests_enabled)
# Create resource data file
# Create resource data file
test_resources_binary_c = custom_target('test_resources_binary.c',
input : 'test5.gresource.xml',
output : 'test_resources_binary.c',
@ -584,7 +596,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'--c-name', '_g_binary_test1',
'@INPUT@'])
# Create object file containing resource data
# Create object file containing resource data
test_resources_binary = custom_target('test_resources.o',
input : test_gresource_binary,
output : 'test_resources.o',
@ -594,7 +606,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'@INPUT@',
'-o','@OUTPUT@'])
# Rename symbol to match the one in the C file
# Rename symbol to match the one in the C file
test_resources_binary2 = custom_target('test_resources2.o',
input : test_resources_binary,
output : 'test_resources2.o',
@ -603,21 +615,17 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
'@INPUT@',
'@OUTPUT@'])
gio_tests += {
'resources' : {
'extra_sources' : [test_gresource, test_resources_c, test_resources2_c,
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],
},
}
resources_extra_sources += [
test_resources_binary_c,
test_resources_binary2,
]
endif
gio_tests += {
'resources' : {
'extra_sources' : resources_extra_sources,
},
}
endif
foreach test_name, extra_args : gio_tests