Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 1 | From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] Enable more tests while cross-compiling |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream disables a few tests while cross-compiling because their build requires |
| 7 | running other built binaries. This usually makes sense but in the cross-compile |
| 8 | case we can depend on glib-2.0-native. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [OE specific] |
| 11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 12 | |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 13 | --- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 14 | gio/tests/meson.build | 24 ++++++++++++------------ |
| 15 | 1 file changed, 12 insertions(+), 12 deletions(-) |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 16 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 18 | index 788cf97..dab65d2 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | --- a/gio/tests/meson.build |
| 20 | +++ b/gio/tests/meson.build |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 21 | @@ -203,7 +203,7 @@ if host_machine.system() != 'windows' |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | |
| 23 | # Test programs that need to bring up a session bus (requires dbus-daemon) |
| 24 | have_dbus_daemon = find_program('dbus-daemon', required : false).found() |
| 25 | - if have_dbus_daemon |
| 26 | + if true |
| 27 | annotate_args = [ |
| 28 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', |
| 29 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 30 | @@ -548,12 +548,12 @@ if installed_tests_enabled |
| 31 | endforeach |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 32 | endif |
| 33 | |
| 34 | -if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 35 | +if meson.is_cross_build() |
| 36 | |
| 37 | plugin_resources_c = custom_target('plugin-resources.c', |
| 38 | input : 'test4.gresource.xml', |
| 39 | output : 'plugin-resources.c', |
| 40 | - command : [glib_compile_resources, |
| 41 | + command : ['glib-compile-resources', |
| 42 | '--target=@OUTPUT@', |
| 43 | '--sourcedir=' + meson.current_source_dir(), |
| 44 | '--generate-source', |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 45 | @@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 46 | test_gresource = custom_target('test.gresource', |
| 47 | input : 'test.gresource.xml', |
| 48 | output : 'test.gresource', |
| 49 | - command : [glib_compile_resources, |
| 50 | + command : ['glib-compile-resources', |
| 51 | '--target=@OUTPUT@', |
| 52 | '--sourcedir=' + meson.current_source_dir(), |
| 53 | '--sourcedir=' + meson.current_build_dir(), |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 54 | @@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 55 | test_resources2_c = custom_target('test_resources2.c', |
| 56 | input : 'test3.gresource.xml', |
| 57 | output : 'test_resources2.c', |
| 58 | - command : [glib_compile_resources, |
| 59 | + command : ['glib-compile-resources', |
| 60 | '--target=@OUTPUT@', |
| 61 | '--sourcedir=' + meson.current_source_dir(), |
| 62 | '--generate', |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 63 | @@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 64 | test_resources2_h = custom_target('test_resources2.h', |
| 65 | input : 'test3.gresource.xml', |
| 66 | output : 'test_resources2.h', |
| 67 | - command : [glib_compile_resources, |
| 68 | + command : ['glib-compile-resources', |
| 69 | '--target=@OUTPUT@', |
| 70 | '--sourcedir=' + meson.current_source_dir(), |
| 71 | '--generate', |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 72 | @@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 73 | input : 'test2.gresource.xml', |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 74 | depends : big_test_resource, |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 75 | output : 'test_resources.c', |
| 76 | - command : [glib_compile_resources, |
| 77 | + command : ['glib-compile-resources', |
| 78 | '--target=@OUTPUT@', |
| 79 | '--sourcedir=' + meson.current_source_dir(), |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 80 | '--sourcedir=' + meson.current_build_dir(), |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 81 | @@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 82 | digit_test_resources_c = custom_target('digit_test_resources.c', |
| 83 | input : '111_digit_test.gresource.xml', |
| 84 | output : 'digit_test_resources.c', |
| 85 | - command : [glib_compile_resources, |
| 86 | + command : ['glib-compile-resources', |
| 87 | '--target=@OUTPUT@', |
| 88 | '--sourcedir=' + meson.current_source_dir(), |
| 89 | '--sourcedir=' + meson.current_build_dir(), |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 90 | @@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 91 | digit_test_resources_h = custom_target('digit_test_resources.h', |
| 92 | input : '111_digit_test.gresource.xml', |
| 93 | output : 'digit_test_resources.h', |
| 94 | - command : [glib_compile_resources, |
| 95 | + command : ['glib-compile-resources', |
| 96 | '--target=@OUTPUT@', |
| 97 | '--sourcedir=' + meson.current_source_dir(), |
| 98 | '--generate', |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 99 | @@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 100 | |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 101 | ld = find_program('ld', required : false) |
| 102 | |
| 103 | - if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 104 | + if not meson.is_cross_build() |
| 105 | test_gresource_binary = custom_target('test5.gresource', |
| 106 | input : 'test5.gresource.xml', |
| 107 | output : 'test5.gresource', |
| 108 | - command : [glib_compile_resources, |
| 109 | + command : ['glib-compile-resources', |
| 110 | '--target=@OUTPUT@', |
| 111 | '--sourcedir=' + meson.current_source_dir(), |
| 112 | '--sourcedir=' + meson.current_build_dir(), |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 113 | @@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 114 | test_resources_binary_c = custom_target('test_resources_binary.c', |
| 115 | input : 'test5.gresource.xml', |
| 116 | output : 'test_resources_binary.c', |
| 117 | - command : [glib_compile_resources, |
| 118 | + command : ['glib-compile-resources', |
| 119 | '--target=@OUTPUT@', |
| 120 | '--sourcedir=' + meson.current_source_dir(), |
| 121 | '--sourcedir=' + meson.current_build_dir(), |