[geary/mjog/fix-meson-0.57-ci-test-failures] build: Fix Flatpak CI test failures caused by meson 0.57
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/mjog/fix-meson-0.57-ci-test-failures] build: Fix Flatpak CI test failures caused by meson 0.57
- Date: Thu, 22 Apr 2021 15:00:28 +0000 (UTC)
commit 454cc0bcfea1e31252a502732f4cc599041d0ed4
Author: Michael Gratton <mike vee net>
Date: Fri Apr 23 00:36:54 2021 +1000
build: Fix Flatpak CI test failures caused by meson 0.57
Add previously implicit build dependencies for tests.
See GNOME/gnome-build-meta#372,
https://discourse.gnome.org/t/meson-0-57-update-may-break-tests-ci/6220
desktop/meson.build | 8 +++++++-
test/meson.build | 12 ++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/desktop/meson.build b/desktop/meson.build
index 712db358a..d5c2c7f7b 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -39,7 +39,10 @@ foreach desktop_file: desktop_output
test(
'desktop-file-validate',
desktop_file_validate,
- args: [ desktop_file.full_path() ]
+ args: [ desktop_file.full_path() ],
+ depends: [
+ desktop_file,
+ ]
)
endif
endforeach
@@ -69,6 +72,9 @@ if appstream_util.found()
appstream_util,
args: [
'validate-relax', '--nonet', appdata_merged.full_path()
+ ],
+ depends: [
+ appdata_merged,
]
)
endif
diff --git a/test/meson.build b/test/meson.build
index a4fe2c292..dd1ce6889 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -168,5 +168,13 @@ test_integration_bin = executable('test-integration',
c_args: geary_c_args,
)
-test('engine-tests', test_engine_bin)
-test('client-tests', test_client_bin)
+test(
+ 'engine-tests',
+ test_engine_bin,
+ depends: [ engine_lib ]
+)
+test(
+ 'client-tests',
+ test_client_bin,
+ depends: [ client_lib, web_process ]
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]