From a999798daad7181110922a7e756eb1d8dfe55c4e Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 19 Nov 2018 13:44:15 -0800 Subject: meson: Add tests to suites Meson test has a concepts of suites, which allow tests to be grouped together. This allows for a subtest of tests to be run only (say only the tests for nir). A test can be added to more than one suite, but for the most part I've only added a test to a single suite, though I've added a compiler group that includes nir, glsl, and glcpp tests. To use this you'll need to invoke meson test directly, instead of ninja test (which always runs all targets). it can be invoked as: `meson test -C builddir --suite $suitename` (meson test has addition options that are pretty useful). Tested-By: Gert Wollny Acked-by: Eric Engestrom --- src/compiler/glsl/tests/meson.build | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/compiler/glsl/tests/meson.build') diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build index 2a41e30a28d..02f3355c43c 100644 --- a/src/compiler/glsl/tests/meson.build +++ b/src/compiler/glsl/tests/meson.build @@ -26,7 +26,8 @@ test( c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], include_directories : [inc_common, inc_compiler], link_with : [libglsl], - ) + ), + suite : ['compiler', 'glsl'], ) test( @@ -38,7 +39,8 @@ test( include_directories : [inc_common, inc_glsl], link_with : [libglsl], dependencies : [dep_clock, dep_thread], - ) + ), + suite : ['compiler', 'glsl'], ) @@ -54,7 +56,8 @@ test( include_directories : [inc_common, inc_glsl], link_with : [libglsl, libglsl_standalone, libglsl_util], dependencies : [dep_clock, dep_thread, idep_gtest], - ) + ), + suite : ['compiler', 'glsl'], ) test( @@ -68,7 +71,8 @@ test( include_directories : [inc_common, inc_glsl], link_with : [libglsl, libglsl_util], dependencies : [dep_thread, idep_gtest], - ) + ), + suite : ['compiler', 'glsl'], ) test( @@ -80,7 +84,8 @@ test( include_directories : [inc_common, inc_glsl], link_with : [libglsl, libglsl_util], dependencies : [dep_thread, idep_gtest], - ) + ), + suite : ['compiler', 'glsl'], ) test( @@ -93,7 +98,9 @@ test( meson.source_root(), 'src', 'compiler', 'glsl', 'tests', 'warnings' ), ], + suite : ['compiler', 'glsl'], ) + test( 'glsl optimization', prog_python, @@ -101,4 +108,5 @@ test( join_paths(meson.current_source_dir(), 'optimization_test.py'), '--test-runner', glsl_test ], + suite : ['compiler', 'glsl'], ) -- cgit v1.2.3