From 4fe6a5fad9a2f1bd16ad3fa88fc6193fac1411ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 22 Aug 2024 13:59:20 +0200 Subject: [PATCH] tests: Install most tests Tests that needs to run in a virtual machine are excluded. Part-of: --- src/tests/generic.test.in | 5 +++++ src/tests/meson.build | 42 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/tests/generic.test.in diff --git a/src/tests/generic.test.in b/src/tests/generic.test.in new file mode 100644 index 000000000..191354463 --- /dev/null +++ b/src/tests/generic.test.in @@ -0,0 +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@' +Type=session +Output=TAP diff --git a/src/tests/meson.build b/src/tests/meson.build index 3736590d6..a3feb8938 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -303,6 +303,9 @@ test_cases += [ 'name': 'keybindings', 'suite': 'input', 'sources': [ 'keybindings.c' ], + 'installed_runner_args': [ + '--compile-schemas', + ], }, ] @@ -911,4 +914,43 @@ if have_installed_tests install_dir: mutter_installed_tests_datadir, ) endforeach + + install_subdir('monitor-configs', install_dir: tests_datadir) + install_subdir('migration', install_dir: tests_datadir) + install_subdir('ref-tests', install_dir: tests_datadir) + install_subdir('icc-profiles', install_dir: tests_datadir) + + install_data('org.gnome.mutter.test.gschema.xml', install_dir: tests_datadir) + + foreach test_case: test_cases + if test_case.has_key('installed_runner_args') + runner_args = test_case['installed_runner_args'] + else + runner_args = [] + endif + + if test_case.has_key('launch') + foreach service: test_case['launch'] + runner_args += '--launch=@0@'.format(service) + endforeach + endif + + installed_tests_cdata = configuration_data() + installed_tests_cdata.set('apiversion', libmutter_api_version) + installed_tests_cdata.set('libexecdir', libexecdir) + installed_tests_cdata.set('pkgdatadir', pkgdatadir) + 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('runnerargs', ' '.join(runner_args)) + + configure_file( + input: 'generic.test.in', + output: test_case['name'] + '.test', + configuration: installed_tests_cdata, + install: true, + install_dir: mutter_installed_tests_datadir, + ) + endforeach + endif