From 932f4fab14e47479339b909c098814d837173475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 5 Apr 2023 17:44:02 +0200 Subject: installed-tests/meson: Add tests dependencies on gjs console We require the console to run the tests so add it as dependencies. --- installed-tests/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installed-tests/meson.build b/installed-tests/meson.build index ee5039eb..dc3c8c98 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -25,7 +25,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: gjs_console) test_description_subst = { 'name': 'test@0@.sh'.format(test), @@ -80,7 +80,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: gjs_console) test_description_subst = { 'name': '@0@.debugger'.format(test), -- cgit v1.2.1 From a482ba9a2772e2cc34a1f9e3efc5d698ffa78392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 5 Apr 2023 17:44:41 +0200 Subject: installed-tests/meson: Add GjsPrivate as tests dependency It's used by gjs internally, so add it as default tests dependencies. Without this `meson test` would fail without compiling before. --- installed-tests/js/meson.build | 1 + installed-tests/meson.build | 8 ++++++-- 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 dc3c8c98..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', depends: gjs_console) + 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', depends: gjs_console) + suite: 'Debugger', depends: tests_dependencies) test_description_subst = { 'name': '@0@.debugger'.format(test), -- cgit v1.2.1