summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-12-11 16:13:31 -0800
committerDylan Baker <[email protected]>2018-01-11 15:40:02 -0800
commit4ccb9816737945159289527322e759d92bf7a4d6 (patch)
tree5f4cc22fa3d962cfde826599e5a95e26904bdc8d /src/mapi
parent8e981eb2b7099849c7b74d855afb0c65f92227e8 (diff)
meson: Use consistent style for tests
Don't use intermediate variables, use consistent whitespace. Acked-by: Eric Engestrom <[email protected]> Signed-off-by: Dylan Baker <[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.build13
-rw-r--r--src/mapi/shared-glapi/meson.build19
4 files changed, 21 insertions, 17 deletions
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index 53851da306b..ea14654d2c4 100644
--- a/src/mapi/es1api/meson.build
+++ b/src/mapi/es1api/meson.build
@@ -52,7 +52,8 @@ pkg.generate(
)
if with_tests
- test('es1-ABI-check',
+ test(
+ 'es1-ABI-check',
find_program('ABI-check'),
args : libglesv1_cm
)
diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
index 8751107cb71..de8a29bb6be 100644
--- a/src/mapi/es2api/meson.build
+++ b/src/mapi/es2api/meson.build
@@ -52,7 +52,8 @@ pkg.generate(
)
if with_tests
- test('es2-ABI-check',
+ test(
+ 'es2-ABI-check',
find_program('ABI-check'),
args : libgles2
)
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 8856a95fb66..267cfe7e7be 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -78,12 +78,13 @@ libglapi_static = static_library(
)
if not with_shared_glapi and with_tests
- glapi_static_check_table = executable(
+ test(
'glapi_static_check_table',
- 'tests/check_table.cpp',
- link_with : [libglapi_static],
- dependencies : [idep_gtest],
+ executable(
+ 'glapi_static_check_table',
+ 'tests/check_table.cpp',
+ link_with : [libglapi_static],
+ dependencies : [idep_gtest],
+ )
)
-
- test('glapi_static_check_table', glapi_static_check_table)
endif
diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index fe0d458d934..c7d136ced2c 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -51,14 +51,15 @@ libglapi = shared_library(
)
if with_tests
- shared_glapi_test = executable(
- ['shared-glapi-test', glapitable_h],
- 'tests/check_table.cpp',
- cpp_args : [cpp_msvc_compat_args],
- include_directories : [inc_src, inc_include, inc_mapi],
- link_with : [libglapi],
- dependencies : [dep_thread, idep_gtest],
+ test(
+ 'shared-glapi-test',
+ executable(
+ ['shared-glapi-test', glapitable_h],
+ 'tests/check_table.cpp',
+ cpp_args : [cpp_msvc_compat_args],
+ include_directories : [inc_src, inc_include, inc_mapi],
+ link_with : [libglapi],
+ dependencies : [dep_thread, idep_gtest],
+ )
)
-
- test('shared-glapi-test', shared_glapi_test)
endif