summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2021-04-21 16:35:43 -0500
committerMichael Catanzaro <mcatanzaro@gnome.org>2021-04-29 00:11:40 +0000
commitd35b03c90924639f8fdad8648c85a24e94800bfb (patch)
treece12d2095390e71051647a47962f42961f75c0ad
parent86bea47e587b74b24fa0a5f0a0b3cd6b77dbea62 (diff)
downloadepiphany-d35b03c90924639f8fdad8648c85a24e94800bfb.tar.gz
Add missing test dependencies to fix CI
See gnome-build-meta#372 (cherry picked from commit c40a2be787df03dca706b2d70450795791b556ea)
-rw-r--r--data/meson.build8
-rw-r--r--src/meson.build4
-rw-r--r--tests/meson.build10
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 c25d88eff..bc806b3a4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -94,7 +94,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,
@@ -139,7 +139,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 8ddcb250b..9be89a186 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',