summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Chimento <philip.chimento@gmail.com>2023-04-09 05:23:01 +0000
committerPhilip Chimento <philip.chimento@gmail.com>2023-04-09 05:23:01 +0000
commit3be5116537e45984ecaf8f6c522ff6613aa7d9d4 (patch)
treef0c8eb187e53cffee29a9b8a75e36f1973fdf870
parentde0d76a1061b5aff333ba850ab32317eb557ce8e (diff)
parenta482ba9a2772e2cc34a1f9e3efc5d698ffa78392 (diff)
downloadgjs-3be5116537e45984ecaf8f6c522ff6613aa7d9d4.tar.gz
Merge branch 'meson-test-dependencies-fix' into 'master'
installed-tests/meson: Add tests dependencies on gjs console and GjsPrivate See merge request GNOME/gjs!835
-rw-r--r--installed-tests/js/meson.build1
-rw-r--r--installed-tests/meson.build8
2 files changed, 7 insertions, 2 deletions
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 1e953ceb..4d7b3aad 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -164,6 +164,7 @@ gschemas_compiled = gnome.compile_schemas(
tests_dependencies = [
gschemas_compiled,
+ gjs_private_typelib,
gjstest_tools_typelib,
gimarshallingtests_typelib,
regress_typelib,
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index ee5039eb..d270cb4a 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -10,6 +10,10 @@ installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
# Simple shell script tests #
simple_tests = []
+tests_dependencies = [
+ gjs_console,
+ gjs_private_typelib,
+]
# The test scripts need to be ported from shell scripts
# for clang-cl builds, which do not use BASH-style shells
@@ -25,7 +29,7 @@ foreach test : simple_tests
test_file = files('scripts' / 'test@0@.sh'.format(test))
test(test, test_file, env: tests_environment, protocol: 'tap',
- suite: 'Scripts')
+ suite: 'Scripts', depends: tests_dependencies)
test_description_subst = {
'name': 'test@0@.sh'.format(test),
@@ -80,7 +84,7 @@ foreach test : debugger_tests
test('@0@ command'.format(test), debugger_test_driver,
args: test_file, env: tests_environment, protocol: 'tap',
- suite: 'Debugger')
+ suite: 'Debugger', depends: tests_dependencies)
test_description_subst = {
'name': '@0@.debugger'.format(test),