aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-12-19 15:54:28 +0100
committerXavier Claessens <xclaesse@gmail.com>2019-12-19 11:13:30 -0500
commitca34d01dcc2fffa831cfa9c4c13d6aab82d58bce (patch)
tree39d528becbecb4ff016c186deb55d65db9f60e0b
parent792a84199b8829c923968e8816a27e021647d146 (diff)
downloadmeson-ca34d01dcc2fffa831cfa9c4c13d6aab82d58bce.zip
meson-ca34d01dcc2fffa831cfa9c4c13d6aab82d58bce.tar.gz
meson-ca34d01dcc2fffa831cfa9c4c13d6aab82d58bce.tar.bz2
CI: Skip git tests if g-ir-scanner does not exist
-rw-r--r--test cases/frameworks/22 gir link order/meson.build2
-rw-r--r--test cases/frameworks/28 gir link order 2/meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/frameworks/22 gir link order/meson.build b/test cases/frameworks/22 gir link order/meson.build
index 224eaf6..8a714b5 100644
--- a/test cases/frameworks/22 gir link order/meson.build
+++ b/test cases/frameworks/22 gir link order/meson.build
@@ -1,6 +1,6 @@
project('gir link order', 'c')
-if not dependency('glib-2.0', required : false).found()
+if not dependency('glib-2.0', required : false).found() or not find_program('g-ir-scanner', required: false).found()
error('MESON_SKIP_TEST glib not found.')
endif
diff --git a/test cases/frameworks/28 gir link order 2/meson.build b/test cases/frameworks/28 gir link order 2/meson.build
index 5465a5b..a26531b 100644
--- a/test cases/frameworks/28 gir link order 2/meson.build
+++ b/test cases/frameworks/28 gir link order 2/meson.build
@@ -1,6 +1,6 @@
project('gir link order 2', 'c')
-if not dependency('gobject-2.0', required : false).found()
+if not dependency('gobject-2.0', required : false).found() or not find_program('g-ir-scanner', required: false).found()
error('MESON_SKIP_TEST gobject not found.')
endif