summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-11-02 17:07:09 -0600
committerBrian Paul <brianp@vmware.com>2012-11-13 13:47:39 -0700
commitfa79f285de7473e8bc5bed2fa84d13a695ec7ea9 (patch)
treea38d046face3022ec94468f8154038387cec0370
parent751af96a4582cd55d2e10f899c830de5dd9fade2 (diff)
arb_sampler_objects: prefix all tests with "arb_sampler_objects-"
Two of the tests had the prefix, two others didn't. v2: update all.tests too Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--tests/all.tests4
-rw-r--r--tests/spec/arb_sampler_objects/CMakeLists.gl.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/all.tests b/tests/all.tests
index 46cb70dd..ec5c91f2 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1004,8 +1004,8 @@ add_plain_test(arb_occlusion_query, 'occlusion_query')
# Group ARB_sampler_objects
arb_sampler_objects = Group()
spec['ARB_sampler_objects'] = arb_sampler_objects
-add_plain_test(arb_sampler_objects, 'sampler-objects')
-add_plain_test(arb_sampler_objects, 'sampler-incomplete')
+arb_sampler_objects['sampler-objects'] = concurrent_test('arb_sampler_objects-sampler-objects')
+arb_sampler_objects['sampler-incomplete'] = concurrent_test('arb_sampler_objects-sampler-incomplete')
arb_sampler_objects['GL_EXT_texture_sRGB_decode'] = concurrent_test('arb_sampler_objects-srgb-decode')
arb_sampler_objects['framebufferblit'] = plain_test('arb_sampler_objects-framebufferblit')
diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
index c58f6f4a..23070a3a 100644
--- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
@@ -9,8 +9,8 @@ link_libraries (
${OPENGL_glu_LIBRARY}
)
-piglit_add_executable (sampler-objects sampler-objects.c)
-piglit_add_executable (sampler-incomplete sampler-incomplete.c)
+piglit_add_executable (arb_sampler_objects-sampler-objects sampler-objects.c)
+piglit_add_executable (arb_sampler_objects-sampler-incomplete sampler-incomplete.c)
piglit_add_executable (arb_sampler_objects-srgb-decode srgb-decode.c)
piglit_add_executable (arb_sampler_objects-framebufferblit framebufferblit.c)