brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/build: Allow passing commandline arguments to tests

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4190>
This commit is contained in:
Jonas Ådahl
2024-12-18 00:09:17 +01:00
committed by Marge Bot
parent c80134d1ba
commit 7a39f05b69
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/generic.test.in
View File

@ -1,5 +1,5 @@
[Test] [Test]
Description=Mutter test: @testname@ 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 Type=session
Output=TAP Output=TAP

4
src/tests/meson.build
View File

@ -806,8 +806,11 @@ foreach test_case: test_cases
test_depends = [ default_plugin ] + test_case.get('depends', []) test_depends = [ default_plugin ] + test_case.get('depends', [])
args = test_case.get('args', [])
test(test_case['name'], test_executable, test(test_case['name'], test_executable,
suite: ['core', 'mutter/' + test_case['suite']], suite: ['core', 'mutter/' + test_case['suite']],
args: args,
env: test_env, env: test_env,
depends: test_depends, depends: test_depends,
is_parallel: false, 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('reftestresultdir', '/tmp/mutter-ref-test-results')
installed_tests_cdata.set('testname', test_case['name']) installed_tests_cdata.set('testname', test_case['name'])
installed_tests_cdata.set('testexecutable', 'mutter-' + 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)) installed_tests_cdata.set('runnerargs', ' '.join(runner_args))
configure_file( configure_file(