summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gall <tom.gall@linaro.org>2013-01-02 15:45:47 -0600
committerEric Anholt <eric@anholt.net>2013-01-09 11:57:31 -0800
commit0d125fa275522e602a538caae3b86681aab2b8a6 (patch)
tree14c4e59417fb4fa29f57250977ff704ae21001fb
parent3e46942e60b91938453add82989f9f94f0f4fa9c (diff)
gles2: add invalid-es3-queries_gles2 to all.tests
Also changes invalid-es3-quesies to follow conventions and be built as invalid-es3-queries_gles2 Signed-off-by: Tom Gall <tom.gall@linaro.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--tests/all.tests4
-rw-r--r--tests/spec/gles-2.0/CMakeLists.gles2.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/all.tests b/tests/all.tests
index 427f7d065..08b79177f 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -2701,6 +2701,10 @@ egl_khr_create_context['3.2 core profile required'] = plain_test('egl-create-con
egl_khr_create_context['pre-GL3.2 profile'] = plain_test('egl-create-context-pre-GL32-profile')
egl_khr_create_context['verify GL flavor'] = plain_test('egl-create-context-verify-gl-flavor')
+gles20 = Group()
+spec['!OpenGL ES 2.0'] = gles20
+add_concurrent_test(gles20, 'invalid-es3-queries_gles2')
+
gles30 = Group()
spec['!OpenGL ES 3.0'] = gles30
for tex_format in ('rgb8', 'srgb8', 'rgba8', 'srgb8-alpha8', 'r11', 'rg11', 'rgb8-punchthrough-alpha1', 'srgb8-punchthrough-alpha1'):
diff --git a/tests/spec/gles-2.0/CMakeLists.gles2.txt b/tests/spec/gles-2.0/CMakeLists.gles2.txt
index 4d06a02ae..ab78280cf 100644
--- a/tests/spec/gles-2.0/CMakeLists.gles2.txt
+++ b/tests/spec/gles-2.0/CMakeLists.gles2.txt
@@ -2,6 +2,6 @@ link_libraries(
piglitutil_${piglit_target_api}
)
-piglit_add_executable(gles2-invalid-es3-queries invalid-es3-queries.c)
+piglit_add_executable(invalid-es3-queries_gles2 invalid-es3-queries.c)
# vim: ft=cmake: