[gnome-bluetooth/wip/hadess/misc-fixes: 2/2] build: Move tests condition into directory's meson.build
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth/wip/hadess/misc-fixes: 2/2] build: Move tests condition into directory's meson.build
- Date: Mon, 22 Nov 2021 16:01:53 +0000 (UTC)
commit fba8735386dee2fac0f871cc6406d31f7198a4f3
Author: Bastien Nocera <hadess hadess net>
Date: Fri Nov 19 13:19:26 2021 +0100
build: Move tests condition into directory's meson.build
meson.build | 5 +----
tests/meson.build | 24 +++++++++++++-----------
2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/meson.build b/meson.build
index 99e657a6..b7fd1e04 100644
--- a/meson.build
+++ b/meson.build
@@ -115,10 +115,7 @@ if enable_gtk_doc
endif
subdir('po')
-
-if enable_gir
- subdir('tests')
-endif
+subdir('tests')
configure_file(
output: 'config.h',
diff --git a/tests/meson.build b/tests/meson.build
index cd8dec99..a95cbb5d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,14 +1,16 @@
-integration_test = find_program('integration-test')
+if enable_gir
+ integration_test = find_program('integration-test')
-envs = environment()
-envs.set ('top_builddir', meson.build_root())
-envs.set ('top_srcdir', meson.source_root())
+ envs = environment()
+ envs.set ('top_builddir', meson.build_root())
+ envs.set ('top_srcdir', meson.source_root())
-test_deps = [ gnomebt_priv_gir, ]
+ test_deps = [ gnomebt_priv_gir, ]
-test('gnome-bluetooth-integration-test',
- integration_test,
- args: [ 'Tests' ],
- env: envs,
- depends: test_deps
-)
+ test('gnome-bluetooth-integration-test',
+ integration_test,
+ args: [ 'Tests' ],
+ env: envs,
+ depends: test_deps
+ )
+endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]