[glib] tests: Do not use gnome.genmarshal()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] tests: Do not use gnome.genmarshal()
- Date: Mon, 17 Jul 2017 13:00:57 +0000 (UTC)
commit a45bf85ce5c9bc7dd26551430cd2e2d80e079d1c
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Jul 17 13:59:20 2017 +0100
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.
tests/gobject/meson.build | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
---
diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build
index f406011..ba72d7a 100644
--- a/tests/gobject/meson.build
+++ b/tests/gobject/meson.build
@@ -10,19 +10,37 @@ gobject_tests = [
['references'],
]
-# The marshal test requires running a binary, which means we cannot
-# build it when cross-compiling
-if not meson.is_cross_build() or meson.has_exe_wrapper()
- gnome = import('gnome')
-
- testmarshal_srcs = gnome.genmarshal('testmarshal',
- sources : 'testmarshal.list',
- prefix : 'test_marshal')
-
- gobject_tests += [
- ['accumulator', ['accumulator.c', testmarshal_srcs]],
- ]
-endif
+# We cannot use gnome.genmarshal() here
+testmarshal_h = custom_target('testmarshal_h',
+ output : 'testmarshal.h',
+ input : 'testmarshal.list',
+ command : [
+ python, glib_genmarshal,
+ '--prefix=test_marshal',
+ '--output=@OUTPUT@',
+ '--quiet',
+ '--header',
+ '@INPUT@',
+ ],
+)
+
+testmarshal_c = custom_target('testmarshal_c',
+ output : 'testmarshal.c',
+ input : 'testmarshal.list',
+ command : [
+ python, glib_genmarshal,
+ '--prefix=test_marshal',
+ '--include-header=testmarshal.h',
+ '--output=@OUTPUT@',
+ '--quiet',
+ '--body',
+ '@INPUT@',
+ ],
+)
+
+gobject_tests += [
+ ['accumulator', ['accumulator.c', testmarshal_c, testmarshal_h]],
+]
foreach t : gobject_tests
test_name = t.get(0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]