[epiphany/gnome-40] Add missing test dependencies to fix CI
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/gnome-40] Add missing test dependencies to fix CI
- Date: Thu, 29 Apr 2021 00:09:46 +0000 (UTC)
commit 38d053a88e3f29f4f9ae4d5244d33ad5f0d939a7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Wed Apr 21 16:35:43 2021 -0500
Add missing test dependencies to fix CI
See gnome-build-meta#372
(cherry picked from commit c40a2be787df03dca706b2d70450795791b556ea)
data/meson.build | 8 ++++----
src/meson.build | 4 ++--
tests/meson.build | 10 ++++++----
3 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index ae77632b6..46df3fd80 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -124,9 +124,8 @@ if desktop_file_validate.found()
test(
'validate-desktop',
desktop_file_validate,
- args: [
- desktop.full_path()
- ]
+ args: desktop.full_path(),
+ depends: desktop
)
endif
@@ -136,6 +135,7 @@ if appstream_util.found()
'validate-appdata', appstream_util,
args: [
'validate-relax', '--nonet', appdata.full_path()
- ]
+ ],
+ depends: appdata
)
endif
diff --git a/src/meson.build b/src/meson.build
index fa2318567..7f77173f2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -103,7 +103,7 @@ ephymain_dep = declare_dependency(
)
-executable('ephy-profile-migrator',
+ephy_profile_migrator = executable('ephy-profile-migrator',
'profile-migrator/ephy-profile-migrator.c',
dependencies: ephymain_dep,
install: true,
@@ -148,7 +148,7 @@ epiphany_sources = [
readability_resources,
]
-executable('epiphany',
+epiphany = executable('epiphany',
epiphany_sources,
dependencies: ephymain_dep,
install: true,
diff --git a/tests/meson.build b/tests/meson.build
index 800239ac4..aebe007c0 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -97,8 +97,9 @@ if get_option('unit_tests').enabled()
c_args: test_cargs,
)
test('Migration test',
- migration_test,
- env: envs
+ migration_test,
+ env: envs,
+ depends: ephy_profile_migrator
)
# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=707220
@@ -162,8 +163,9 @@ if get_option('unit_tests').enabled()
c_args: test_cargs,
)
test('Web app utils test',
- web_app_utils_test,
- env: envs
+ web_app_utils_test,
+ env: envs,
+ depends: epiphany
)
web_view_test = executable('test-ephy-web-view',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]