aboutsummaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-11-19 13:44:15 -0800
committerDylan Baker <[email protected]>2018-11-20 09:09:22 -0800
commita999798daad7181110922a7e756eb1d8dfe55c4e (patch)
treedd7d629beec14d57d406a8852717b32726d6888d /src/mapi
parentb787dcf57b7298868ce9b6885a827d57a6127ba1 (diff)
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 <[email protected]> Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/es1api/meson.build3
-rw-r--r--src/mapi/es2api/meson.build3
-rw-r--r--src/mapi/glapi/meson.build3
-rw-r--r--src/mapi/shared-glapi/meson.build3
4 files changed, 8 insertions, 4 deletions
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index d8a77a41df2..53e894f091c 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -56,6 +56,7 @@ if with_tests
'es1-ABI-check',
find_program('ABI-check'),
env : env_test,
- args : libglesv1_cm
+ args : libglesv1_cm,
+ suite : ['mapi'],
)
endif
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 891e6f7b27b..1f397e2b752 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -56,6 +56,7 @@ if with_tests
'es2-ABI-check',
find_program('ABI-check'),
env : env_test,
- args : libgles2
+ args : libgles2,
+ suite : ['mapi'],
)
endif
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 048bee8a1ad..7e8bc38a817 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -87,6 +87,7 @@ if with_any_opengl and not with_shared_glapi and with_tests
include_directories : [inc_include, inc_src, inc_mesa, inc_mapi],
link_with : [libglapi_static],
dependencies : [idep_gtest, dep_thread],
- )
+ ),
+ suite : ['mapi'],
)
endif
diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index dcc6079af3d..41da9b1c1c5 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -60,6 +60,7 @@ if with_any_opengl and with_tests
include_directories : [inc_src, inc_include, inc_mapi],
link_with : [libglapi],
dependencies : [dep_thread, idep_gtest],
- )
+ ),
+ suite : ['mapi'],
)
endif