From 7a39f05b6983be2cd1635ad50341d0131952e7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 18 Dec 2024 00:09:17 +0100 Subject: [PATCH] tests/build: Allow passing commandline arguments to tests Part-of: --- src/tests/generic.test.in | 2 +- src/tests/meson.build | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tests/generic.test.in b/src/tests/generic.test.in index 191354463..623e51f24 100644 --- a/src/tests/generic.test.in +++ b/src/tests/generic.test.in @@ -1,5 +1,5 @@ [Test] Description=Mutter test: @testname@ -Exec=sh -ec 'env G_TEST_SRCDIR=@pkgdatadir@ G_TEST_BUILDDIR=@libexecdir@/installed-tests/mutter-@apiversion@ MUTTER_REF_TEST_RESULT_DIR=@reftestresultdir@ @libexecdir@/installed-tests/mutter-@apiversion@/mutter-installed-dbus-session.py @runnerargs@ -- @libexecdir@/installed-tests/mutter-@apiversion@/@testexecutable@' +Exec=sh -ec 'env G_TEST_SRCDIR=@pkgdatadir@ G_TEST_BUILDDIR=@libexecdir@/installed-tests/mutter-@apiversion@ MUTTER_REF_TEST_RESULT_DIR=@reftestresultdir@ @libexecdir@/installed-tests/mutter-@apiversion@/mutter-installed-dbus-session.py @runnerargs@ -- @libexecdir@/installed-tests/mutter-@apiversion@/@testexecutable@ @testargs@' Type=session Output=TAP diff --git a/src/tests/meson.build b/src/tests/meson.build index 380bd8054..65a3e7cd1 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -806,8 +806,11 @@ foreach test_case: test_cases test_depends = [ default_plugin ] + test_case.get('depends', []) + args = test_case.get('args', []) + test(test_case['name'], test_executable, suite: ['core', 'mutter/' + test_case['suite']], + args: args, env: test_env, depends: test_depends, is_parallel: false, @@ -1057,6 +1060,7 @@ if have_installed_tests installed_tests_cdata.set('reftestresultdir', '/tmp/mutter-ref-test-results') installed_tests_cdata.set('testname', test_case['name']) installed_tests_cdata.set('testexecutable', 'mutter-' + test_case['name']) + installed_tests_cdata.set('testargs', ' '.join(test_case.get('args', []))) installed_tests_cdata.set('runnerargs', ' '.join(runner_args)) configure_file(