[Piglit] [PATCH 15/16] all.tests: make all tests in shaders/ concurrent

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 tests/all.tests | 186 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 93 insertions(+), 93 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 144755a..971ee33 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -219,50 +219,50 @@ def add_getactiveuniform_count(group, name, expected):
 add_shader_test_dir(shaders,
                     testsDir + '/shaders',
                     recursive=True)
-add_plain_test(shaders, 'activeprogram-bad-program')
-add_plain_test(shaders, 'activeprogram-get')
-add_plain_test(shaders, 'attribute0')
-add_plain_test(shaders, 'createshaderprogram-bad-type')
-add_plain_test(shaders, 'createshaderprogram-attached-shaders')
-add_plain_test(shaders, 'glsl-arb-fragment-coord-conventions')
-add_plain_test(shaders, 'glsl-arb-fragment-coord-conventions-define')
-add_plain_test(shaders, 'glsl-bug-22603')
-add_plain_test(shaders, 'glsl-bindattriblocation')
-add_plain_test(shaders, 'glsl-dlist-getattriblocation')
-add_plain_test(shaders, 'glsl-getactiveuniform-array-size')
+add_concurrent_test(shaders, 'activeprogram-bad-program')
+add_concurrent_test(shaders, 'activeprogram-get')
+add_concurrent_test(shaders, 'attribute0')
+add_concurrent_test(shaders, 'createshaderprogram-bad-type')
+add_concurrent_test(shaders, 'createshaderprogram-attached-shaders')
+add_concurrent_test(shaders, 'glsl-arb-fragment-coord-conventions')
+add_concurrent_test(shaders, 'glsl-arb-fragment-coord-conventions-define')
+add_concurrent_test(shaders, 'glsl-bug-22603')
+add_concurrent_test(shaders, 'glsl-bindattriblocation')
+add_concurrent_test(shaders, 'glsl-dlist-getattriblocation')
+add_concurrent_test(shaders, 'glsl-getactiveuniform-array-size')
 add_getactiveuniform_count(shaders, 'glsl-getactiveuniform-length', '1')
 add_getactiveuniform_count(shaders, 'glsl-getactiveuniform-ftransform', '2')
 add_getactiveuniform_count(shaders, 'glsl-getactiveuniform-mvp', '2')
-add_plain_test(shaders, 'glsl-getactiveuniform-length')
-add_plain_test(shaders, 'glsl-getattriblocation')
-add_plain_test(shaders, 'getuniform-01')
-add_plain_test(shaders, 'getuniform-02')
-add_plain_test(shaders, 'glsl-invalid-asm-01')
-add_plain_test(shaders, 'glsl-invalid-asm-02')
-add_plain_test(shaders, 'glsl-novertexdata')
-add_plain_test(shaders, 'glsl-preprocessor-comments')
-add_plain_test(shaders, 'glsl-reload-source')
-add_plain_test(shaders, 'glsl-uniform-out-of-bounds')
+add_concurrent_test(shaders, 'glsl-getactiveuniform-length')
+add_concurrent_test(shaders, 'glsl-getattriblocation')
+add_concurrent_test(shaders, 'getuniform-01')
+add_concurrent_test(shaders, 'getuniform-02')
+add_concurrent_test(shaders, 'glsl-invalid-asm-01')
+add_concurrent_test(shaders, 'glsl-invalid-asm-02')
+add_concurrent_test(shaders, 'glsl-novertexdata')
+add_concurrent_test(shaders, 'glsl-preprocessor-comments')
+add_concurrent_test(shaders, 'glsl-reload-source')
+add_concurrent_test(shaders, 'glsl-uniform-out-of-bounds')
 add_concurrent_test(shaders, 'glsl-uniform-out-of-bounds-2')
-add_plain_test(shaders, 'glsl-uniform-update')
-add_plain_test(shaders, 'glsl-unused-varying')
-add_plain_test(shaders, 'glsl-fs-bug25902')
-add_plain_test(shaders, 'glsl-fs-color-matrix')
-add_plain_test(shaders, 'glsl-fs-discard-02')
-add_plain_test(shaders, 'glsl-fs-exp2')
-add_plain_test(shaders, 'glsl-fs-flat-color')
-add_plain_test(shaders, 'glsl-fs-fogcolor-statechange')
-add_plain_test(shaders, 'glsl-fs-fogscale')
-add_plain_test(shaders, 'glsl-fs-fragcoord')
-add_plain_test(shaders, 'glsl-fs-fragcoord-zw-ortho')
-add_plain_test(shaders, 'glsl-fs-fragcoord-zw-perspective')
-add_plain_test(shaders, 'glsl-fs-loop')
-add_plain_test(shaders, 'glsl-fs-loop-nested')
-add_plain_test(shaders, 'glsl-fs-pointcoord')
-add_plain_test(shaders, 'glsl-fs-raytrace-bug27060')
-add_plain_test(shaders, 'glsl-fs-sampler-numbering')
-add_plain_test(shaders, 'glsl-fs-shader-stencil-export')
-add_plain_test(shaders, 'glsl-fs-sqrt-branch')
+add_concurrent_test(shaders, 'glsl-uniform-update')
+add_concurrent_test(shaders, 'glsl-unused-varying')
+add_concurrent_test(shaders, 'glsl-fs-bug25902')
+add_concurrent_test(shaders, 'glsl-fs-color-matrix')
+add_concurrent_test(shaders, 'glsl-fs-discard-02')
+add_concurrent_test(shaders, 'glsl-fs-exp2')
+add_concurrent_test(shaders, 'glsl-fs-flat-color')
+add_concurrent_test(shaders, 'glsl-fs-fogcolor-statechange')
+add_concurrent_test(shaders, 'glsl-fs-fogscale')
+add_concurrent_test(shaders, 'glsl-fs-fragcoord')
+add_concurrent_test(shaders, 'glsl-fs-fragcoord-zw-ortho')
+add_concurrent_test(shaders, 'glsl-fs-fragcoord-zw-perspective')
+add_concurrent_test(shaders, 'glsl-fs-loop')
+add_concurrent_test(shaders, 'glsl-fs-loop-nested')
+add_concurrent_test(shaders, 'glsl-fs-pointcoord')
+add_concurrent_test(shaders, 'glsl-fs-raytrace-bug27060')
+add_concurrent_test(shaders, 'glsl-fs-sampler-numbering')
+add_concurrent_test(shaders, 'glsl-fs-shader-stencil-export')
+add_concurrent_test(shaders, 'glsl-fs-sqrt-branch')
 add_concurrent_test(shaders, 'glsl-fs-texturecube')
 shaders['glsl-fs-texturecube-bias'] = concurrent_test('glsl-fs-texturecube -bias')
 add_concurrent_test(shaders, 'glsl-fs-texturecube-2')
@@ -271,41 +271,41 @@ add_concurrent_test(shaders, 'glsl-fs-textureenvcolor-statechange')
 add_concurrent_test(shaders, 'glsl-fs-texture2drect');
 shaders['glsl-fs-texture2drect-proj3'] = concurrent_test('glsl-fs-texture2drect -proj3')
 shaders['glsl-fs-texture2drect-proj4'] = concurrent_test('glsl-fs-texture2drect -proj4')
-add_plain_test(shaders, 'glsl-fs-user-varying-ff')
-add_plain_test(shaders, 'glsl-mat-attribute')
+add_concurrent_test(shaders, 'glsl-fs-user-varying-ff')
+add_concurrent_test(shaders, 'glsl-mat-attribute')
 shaders['glsl-max-varyings'] = concurrent_test('glsl-max-varyings')
 shaders['glsl-max-varyings >MAX_VARYING_COMPONENTS'] = concurrent_test('glsl-max-varyings --exceed-limits')
-add_plain_test(shaders, 'glsl-orangebook-ch06-bump')
-add_plain_test(shaders, 'glsl-routing')
-add_plain_test(shaders, 'glsl-vs-arrays')
-add_plain_test(shaders, 'glsl-vs-normalscale')
-add_plain_test(shaders, 'glsl-vs-functions')
-add_plain_test(shaders, 'glsl-vs-user-varying-ff')
-add_plain_test(shaders, 'glsl-vs-texturematrix-1')
-add_plain_test(shaders, 'glsl-vs-texturematrix-2')
-add_plain_test(shaders, 'glsl-sin')
-add_plain_test(shaders, 'glsl-cos')
-add_plain_test(shaders, 'glsl-vs-if-bool')
-add_plain_test(shaders, 'glsl-vs-loop')
-add_plain_test(shaders, 'glsl-vs-loop-nested')
-add_plain_test(shaders, 'glsl-vs-mov-after-deref')
-add_plain_test(shaders, 'glsl-vs-mvp-statechange')
-add_plain_test(shaders, 'glsl-vs-raytrace-bug26691')
-add_plain_test(shaders, 'glsl-vs-statechange-1')
-add_plain_test(shaders, 'vp-combined-image-units')
-add_plain_test(shaders, 'glsl-derivs')
-add_plain_test(shaders, 'glsl-deriv-varyings')
-add_plain_test(shaders, 'glsl-fwidth')
-add_plain_test(shaders, 'glsl-lod-bias')
-add_plain_test(shaders, 'vp-ignore-input')
-add_plain_test(shaders, 'glsl-empty-vs-no-fs')
-add_plain_test(shaders, 'glsl-useprogram-displaylist')
-add_plain_test(shaders, 'glsl-vs-point-size')
-add_plain_test(shaders, 'glsl-light-model')
-add_plain_test(shaders, 'glsl-link-bug30552')
-add_plain_test(shaders, 'glsl-link-bug38015')
-add_plain_test(shaders, 'glsl-link-empty-prog-01')
-add_plain_test(shaders, 'glsl-link-empty-prog-02')
+add_concurrent_test(shaders, 'glsl-orangebook-ch06-bump')
+add_concurrent_test(shaders, 'glsl-routing')
+add_concurrent_test(shaders, 'glsl-vs-arrays')
+add_concurrent_test(shaders, 'glsl-vs-normalscale')
+add_concurrent_test(shaders, 'glsl-vs-functions')
+add_concurrent_test(shaders, 'glsl-vs-user-varying-ff')
+add_concurrent_test(shaders, 'glsl-vs-texturematrix-1')
+add_concurrent_test(shaders, 'glsl-vs-texturematrix-2')
+add_concurrent_test(shaders, 'glsl-sin')
+add_concurrent_test(shaders, 'glsl-cos')
+add_concurrent_test(shaders, 'glsl-vs-if-bool')
+add_concurrent_test(shaders, 'glsl-vs-loop')
+add_concurrent_test(shaders, 'glsl-vs-loop-nested')
+add_concurrent_test(shaders, 'glsl-vs-mov-after-deref')
+add_concurrent_test(shaders, 'glsl-vs-mvp-statechange')
+add_concurrent_test(shaders, 'glsl-vs-raytrace-bug26691')
+add_concurrent_test(shaders, 'glsl-vs-statechange-1')
+add_concurrent_test(shaders, 'vp-combined-image-units')
+add_concurrent_test(shaders, 'glsl-derivs')
+add_concurrent_test(shaders, 'glsl-deriv-varyings')
+add_concurrent_test(shaders, 'glsl-fwidth')
+add_concurrent_test(shaders, 'glsl-lod-bias')
+add_concurrent_test(shaders, 'vp-ignore-input')
+add_concurrent_test(shaders, 'glsl-empty-vs-no-fs')
+add_concurrent_test(shaders, 'glsl-useprogram-displaylist')
+add_concurrent_test(shaders, 'glsl-vs-point-size')
+add_concurrent_test(shaders, 'glsl-light-model')
+add_concurrent_test(shaders, 'glsl-link-bug30552')
+add_concurrent_test(shaders, 'glsl-link-bug38015')
+add_concurrent_test(shaders, 'glsl-link-empty-prog-01')
+add_concurrent_test(shaders, 'glsl-link-empty-prog-02')
 shaders['GLSL link single global initializer, 2 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01a.vert shaders/glsl-link-initializer-01b.vert pass')
 shaders['GLSL link matched global initializer, 2 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01c.vert shaders/glsl-link-initializer-01d.vert pass')
 shaders['GLSL link mismatched global initializer, 2 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01b.vert shaders/glsl-link-initializer-01d.vert fail')
@@ -317,26 +317,26 @@ shaders['GLSL link mismatched global initializer expression'] = concurrent_test(
 shaders['GLSL link mismatched invariant'] = concurrent_test('glsl-link-test shaders/glsl-link-invariant-01a.vert shaders/glsl-link-invariant-01b.vert fail')
 shaders['GLSL link mismatched centroid'] = concurrent_test('glsl-link-test shaders/glsl-link-centroid-01a.vert shaders/glsl-link-centroid-01b.vert fail')
 shaders['GLSL link array-of-struct-of-array'] = concurrent_test('glsl-link-test shaders/glsl-link-struct-array.frag pass')
-add_plain_test(shaders, 'glsl-max-vertex-attrib')
-add_plain_test(shaders, 'glsl-kwin-blur-1')
-add_plain_test(shaders, 'glsl-kwin-blur-2')
-add_plain_test(shaders, 'gpu_shader4_attribs')
-add_plain_test(shaders, 'link-mismatch-layout-01')
-add_plain_test(shaders, 'link-mismatch-layout-02')
-add_plain_test(shaders, 'link-mismatch-layout-03')
-add_plain_test(shaders, 'link-unresolved-function')
-add_plain_test(shaders, 'sso-simple')
-add_plain_test(shaders, 'sso-uniforms-01')
-add_plain_test(shaders, 'sso-uniforms-02')
-add_plain_test(shaders, 'sso-user-varying-01')
-add_plain_test(shaders, 'sso-user-varying-02')
-add_plain_test(shaders, 'useprogram-flushverts-1')
-add_plain_test(shaders, 'useprogram-flushverts-2')
-add_plain_test(shaders, 'useprogram-inside-begin')
-add_plain_test(shaders, 'useprogram-refcount-1')
-add_plain_test(shaders, 'useshaderprogram-bad-type')
-add_plain_test(shaders, 'useshaderprogram-bad-program')
-add_plain_test(shaders, 'useshaderprogram-flushverts-1')
+add_concurrent_test(shaders, 'glsl-max-vertex-attrib')
+add_concurrent_test(shaders, 'glsl-kwin-blur-1')
+add_concurrent_test(shaders, 'glsl-kwin-blur-2')
+add_concurrent_test(shaders, 'gpu_shader4_attribs')
+add_concurrent_test(shaders, 'link-mismatch-layout-01')
+add_concurrent_test(shaders, 'link-mismatch-layout-02')
+add_concurrent_test(shaders, 'link-mismatch-layout-03')
+add_concurrent_test(shaders, 'link-unresolved-function')
+add_concurrent_test(shaders, 'sso-simple')
+add_concurrent_test(shaders, 'sso-uniforms-01')
+add_concurrent_test(shaders, 'sso-uniforms-02')
+add_concurrent_test(shaders, 'sso-user-varying-01')
+add_concurrent_test(shaders, 'sso-user-varying-02')
+add_concurrent_test(shaders, 'useprogram-flushverts-1')
+add_concurrent_test(shaders, 'useprogram-flushverts-2')
+add_concurrent_test(shaders, 'useprogram-inside-begin')
+add_concurrent_test(shaders, 'useprogram-refcount-1')
+add_concurrent_test(shaders, 'useshaderprogram-bad-type')
+add_concurrent_test(shaders, 'useshaderprogram-bad-program')
+add_concurrent_test(shaders, 'useshaderprogram-flushverts-1')
 for subtest in ('interstage', 'intrastage', 'vs-gs'):
     cmdline = 'version-mixing {0}'.format(subtest)
     shaders[cmdline] = concurrent_test(cmdline)
-- 
1.8.3.2