mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-02 17:26:17 +01:00
tests: Do not use gnome.genmarshal()
We are providing glib-genmarshal; using the gnome module in Meson does not call the just built glib-genmarshal tool.
This commit is contained in:
parent
4f17d1049f
commit
a45bf85ce5
@ -10,19 +10,37 @@ gobject_tests = [
|
|||||||
['references'],
|
['references'],
|
||||||
]
|
]
|
||||||
|
|
||||||
# The marshal test requires running a binary, which means we cannot
|
# We cannot use gnome.genmarshal() here
|
||||||
# build it when cross-compiling
|
testmarshal_h = custom_target('testmarshal_h',
|
||||||
if not meson.is_cross_build() or meson.has_exe_wrapper()
|
output : 'testmarshal.h',
|
||||||
gnome = import('gnome')
|
input : 'testmarshal.list',
|
||||||
|
command : [
|
||||||
|
python, glib_genmarshal,
|
||||||
|
'--prefix=test_marshal',
|
||||||
|
'--output=@OUTPUT@',
|
||||||
|
'--quiet',
|
||||||
|
'--header',
|
||||||
|
'@INPUT@',
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
testmarshal_srcs = gnome.genmarshal('testmarshal',
|
testmarshal_c = custom_target('testmarshal_c',
|
||||||
sources : 'testmarshal.list',
|
output : 'testmarshal.c',
|
||||||
prefix : 'test_marshal')
|
input : 'testmarshal.list',
|
||||||
|
command : [
|
||||||
|
python, glib_genmarshal,
|
||||||
|
'--prefix=test_marshal',
|
||||||
|
'--include-header=testmarshal.h',
|
||||||
|
'--output=@OUTPUT@',
|
||||||
|
'--quiet',
|
||||||
|
'--body',
|
||||||
|
'@INPUT@',
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
gobject_tests += [
|
gobject_tests += [
|
||||||
['accumulator', ['accumulator.c', testmarshal_srcs]],
|
['accumulator', ['accumulator.c', testmarshal_c, testmarshal_h]],
|
||||||
]
|
]
|
||||||
endif
|
|
||||||
|
|
||||||
foreach t : gobject_tests
|
foreach t : gobject_tests
|
||||||
test_name = t.get(0)
|
test_name = t.get(0)
|
||||||
|
Loading…
Reference in New Issue
Block a user