From dec20d13e1aa128f8575dbb30e59486088378001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 13 Nov 2018 19:37:23 -0600 Subject: [PATCH] meson, tests: Use suites for test cases They allows to filter tests better and so we can just launch tests with: meson test --suite [mutter/stacking|cogl|clutter] [single-test-name] --- clutter/tests/conform/meson.build | 3 ++- cogl/tests/conform/meson.build | 3 ++- cogl/tests/unit/meson.build | 3 ++- src/tests/meson.build | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build index 1387f4990..b89487a09 100644 --- a/clutter/tests/conform/meson.build +++ b/clutter/tests/conform/meson.build @@ -78,7 +78,8 @@ foreach test : clutter_conform_tests install: false, ) - test('clutter/conform/@0@'.format(test), test_executable, + test(test, test_executable, + suite: ['clutter', 'clutter/conform'], env: test_env ) endforeach diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build index efea698e7..8688488e7 100644 --- a/cogl/tests/conform/meson.build +++ b/cogl/tests/conform/meson.build @@ -95,7 +95,8 @@ cogl_conform_unit_tests = custom_target('cogl-tests-conform-unit-tests', install: false, ) -test('cogl/conform', cogl_run_tests, +test('conform', cogl_run_tests, + suite: ['cogl'], args: [ cogl_config_env, libmutter_cogl_test_conformance, diff --git a/cogl/tests/unit/meson.build b/cogl/tests/unit/meson.build index ca852fa25..acbcb617b 100644 --- a/cogl/tests/unit/meson.build +++ b/cogl/tests/unit/meson.build @@ -32,7 +32,8 @@ cogl_unit_unit_tests = custom_target('cogl-tests-unit-unit-tests', install: false, ) -test('cogl/unit', cogl_run_tests, +test('unit', cogl_run_tests, + suite: ['cogl'], args: [ cogl_config_env, libmutter_cogl_test_unit, diff --git a/src/tests/meson.build b/src/tests/meson.build index b176f232f..5bdf5f25b 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -109,13 +109,15 @@ foreach stacking_test: stacking_tests ) endforeach -test('mutter/unit', unit_tests, +test('normal', unit_tests, + suite: ['mutter/unit'], env: test_env, is_parallel: false, timeout: 60, ) -test('mutter/unit/headless-start', headless_start_test, +test('headless-start', headless_start_test, + suite: ['mutter/unit'], env: test_env, is_parallel: false, timeout: 60,