all.tests: Automatically import all shader runner tests in /tests/shaders

This eliminates the ridiculously long enumeration of each shader runner
test.

Signed-off-by: Chad Versace <chad.versace@intel.com>

1 files changed, 25 insertions, 382 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 9cf28b94d..ba6ee225f 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -234,11 +234,28 @@ add_plain_test(general, 'vbo-subdata-zero')
 add_plain_test(general, 'windowoverlap')
 
 shaders = Group()
-def add_shader_generic(group, name):
-	path = testBinDir + '../tests/shaders/'
-	group[name] = PlainExecTest(['shader_runner', '-auto',
-				     path + name + '.shader_test',
-				     path])
+
+def add_shader_test(group, filepath, test_name):
+	"""Add a shader test to the given group."""
+	group[test_name] = PlainExecTest(['shader_runner', '-auto', filepath])
+
+def add_shader_test_dir(group, dirpath, recursive=False):
+	"""Add all shader tests in a directory to the given group."""
+	for filename in os.listdir(dirpath):
+		if path.isdir(filename):
+			if not recursive:
+				continue
+			if not filename in group:
+				group[filename] = Group()
+			add_shader_test_dir(group[filename], filename, recursive)
+		else:
+			ext = filename.rsplit('.')[-1]
+			if ext != 'shader_test':
+				continue
+			testname = filename[0:-(len(ext) + 1)] # +1 for '.'
+			add_shader_test(group,
+					path.join(dirpath, filename),
+					testname)
 
 def add_getactiveuniform_count(group, name, expected):
 	path = 'shaders/'
@@ -247,6 +264,9 @@ def add_getactiveuniform_count(group, name, expected):
 								   path + name + '.vert',
 								   expected])
 
+add_shader_test_dir(shaders,
+                    os.path.dirname(__file__) + '/shaders',
+                    recursive=False)
 add_plain_test(shaders, 'activeprogram-bad-program')
 add_plain_test(shaders, 'activeprogram-get')
 add_plain_test(shaders, 'ati-fs-bad-delete')
@@ -270,70 +290,9 @@ add_plain_test(shaders, 'fp-set-01')
 add_plain_test(shaders, 'fp-set-02')
 add_plain_test(shaders, 'fp-unpack-01')
 add_plain_test(shaders, 'trinity-fp1')
-add_shader_generic(shaders, 'glsl-algebraic-add-add-1')
-add_shader_generic(shaders, 'glsl-algebraic-add-add-2')
-add_shader_generic(shaders, 'glsl-algebraic-add-add-3')
-add_shader_generic(shaders, 'glsl-algebraic-add-add-4')
-add_shader_generic(shaders, 'glsl-algebraic-add-sub-1')
-add_shader_generic(shaders, 'glsl-algebraic-add-sub-2')
-add_shader_generic(shaders, 'glsl-algebraic-add-zero')
-add_shader_generic(shaders, 'glsl-algebraic-add-zero-2')
-add_shader_generic(shaders, 'glsl-algebraic-div-one')
-add_shader_generic(shaders, 'glsl-algebraic-div-one-2')
-add_shader_generic(shaders, 'glsl-algebraic-logicand-false-2')
-add_shader_generic(shaders, 'glsl-algebraic-logicand-false')
-add_shader_generic(shaders, 'glsl-algebraic-logicand-true-2')
-add_shader_generic(shaders, 'glsl-algebraic-logicand-true')
-add_shader_generic(shaders, 'glsl-algebraic-logicor-false-2')
-add_shader_generic(shaders, 'glsl-algebraic-logicor-false')
-add_shader_generic(shaders, 'glsl-algebraic-logicor-true-2')
-add_shader_generic(shaders, 'glsl-algebraic-logicor-true')
-add_shader_generic(shaders, 'glsl-algebraic-logicxor-false')
-add_shader_generic(shaders, 'glsl-algebraic-logicxor-true')
-add_shader_generic(shaders, 'glsl-algebraic-mul-mul-1')
-add_shader_generic(shaders, 'glsl-algebraic-mul-one')
-add_shader_generic(shaders, 'glsl-algebraic-mul-one-2')
-add_shader_generic(shaders, 'glsl-algebraic-mul-zero')
-add_shader_generic(shaders, 'glsl-algebraic-neg-neg')
-add_shader_generic(shaders, 'glsl-algebraic-not-equals')
-add_shader_generic(shaders, 'glsl-algebraic-not-notequals')
-add_shader_generic(shaders, 'glsl-algebraic-pow-two')
-add_shader_generic(shaders, 'glsl-algebraic-rcp-rcp')
-add_shader_generic(shaders, 'glsl-algebraic-rcp-rsq')
-add_shader_generic(shaders, 'glsl-algebraic-rcp-sqrt')
-add_shader_generic(shaders, 'glsl-algebraic-rcp-sqrt-2')
-add_shader_generic(shaders, 'glsl-algebraic-sub-sub-1')
-add_shader_generic(shaders, 'glsl-algebraic-sub-zero-2')
-add_shader_generic(shaders, 'glsl-algebraic-sub-zero-3')
-add_shader_generic(shaders, 'glsl-algebraic-sub-zero-4')
-add_shader_generic(shaders, 'glsl-algebraic-sub-zero')
-add_shader_generic(shaders, 'glsl-array-length')
-add_shader_generic(shaders, 'glsl-array-bounds-01')
-add_shader_generic(shaders, 'glsl-array-bounds-02')
-add_shader_generic(shaders, 'glsl-array-bounds-03')
-add_shader_generic(shaders, 'glsl-array-bounds-04')
-add_shader_generic(shaders, 'glsl-array-bounds-05')
-add_shader_generic(shaders, 'glsl-array-bounds-06')
-add_shader_generic(shaders, 'glsl-array-bounds-07')
-add_shader_generic(shaders, 'glsl-array-bounds-08')
-add_shader_generic(shaders, 'glsl-array-compare')
-add_shader_generic(shaders, 'glsl-array-compare-02')
-add_shader_generic(shaders, 'glsl-array-varying-01')
-add_shader_generic(shaders, 'glsl-array-uniform')
-add_shader_generic(shaders, 'glsl-array-uniform-length')
 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_shader_generic(shaders, 'glsl-clamp-vertex-color')
-add_shader_generic(shaders, 'glsl-constant-folding-call-1')
-add_shader_generic(shaders, 'glsl-copy-propagation-if-1')
-add_shader_generic(shaders, 'glsl-copy-propagation-if-2')
-add_shader_generic(shaders, 'glsl-copy-propagation-if-3')
-add_shader_generic(shaders, 'glsl-copy-propagation-loop-1')
-add_shader_generic(shaders, 'glsl-complex-subscript')
-add_shader_generic(shaders, 'glsl-deadcode-call')
-add_shader_generic(shaders, 'glsl-deadcode-self-assign')
-add_shader_generic(shaders, 'glsl-deadcode-varying')
 add_plain_test(shaders, 'glsl-bindattriblocation')
 add_plain_test(shaders, 'glsl-dlist-getattriblocation')
 add_plain_test(shaders, 'glsl-getactiveuniform-array-size')
@@ -351,134 +310,22 @@ add_plain_test(shaders, 'glsl-reload-source')
 add_plain_test(shaders, 'glsl-uniform-out-of-bounds')
 add_plain_test(shaders, 'glsl-uniform-update')
 add_plain_test(shaders, 'glsl-unused-varying')
-add_shader_generic(shaders, 'glsl-floating-constant-120')
-add_shader_generic(shaders, 'glsl-fs-abs-01')
-add_shader_generic(shaders, 'glsl-fs-abs-02')
-add_shader_generic(shaders, 'glsl-fs-abs-03')
-add_shader_generic(shaders, 'glsl-fs-abs-04')
-add_shader_generic(shaders, 'glsl-fs-abs-neg')
-add_shader_generic(shaders, 'glsl-fs-add-masked')
-add_shader_generic(shaders, 'glsl-fs-all-01')
-add_shader_generic(shaders, 'glsl-fs-all-02')
-add_shader_generic(shaders, 'glsl-fs-any')
-add_shader_generic(shaders, 'glsl-fs-array-redeclaration')
-add_shader_generic(shaders, 'glsl-fs-asin')
-add_shader_generic(shaders, 'glsl-fs-atan-1')
-add_shader_generic(shaders, 'glsl-fs-atan-2')
-add_shader_generic(shaders, 'glsl-fs-atan-3')
-add_shader_generic(shaders, 'glsl-fs-main-return')
-add_shader_generic(shaders, 'glsl-fs-mov-masked')
-add_shader_generic(shaders, 'glsl-fs-bit-01')
-add_shader_generic(shaders, 'glsl-fs-bit-02')
 add_plain_test(shaders, 'glsl-fs-bug25902')
-add_shader_generic(shaders, 'glsl-fs-ceil')
-add_shader_generic(shaders, 'glsl-fs-clamp-1')
 add_plain_test(shaders, 'glsl-fs-color-matrix')
-add_shader_generic(shaders, 'glsl-fs-copy-propagation-texcoords-1')
-add_shader_generic(shaders, 'glsl-fs-copy-propagation-texcoords-2')
-add_shader_generic(shaders, 'glsl-fs-conditional-output-write')
-add_shader_generic(shaders, 'glsl-fs-convolution-1')
-add_shader_generic(shaders, 'glsl-fs-convolution-2')
-add_shader_generic(shaders, 'glsl-fs-cross')
-add_shader_generic(shaders, 'glsl-fs-cross-2')
-add_shader_generic(shaders, 'glsl-fs-cross-3')
-add_shader_generic(shaders, 'glsl-fs-discard-01')
 add_plain_test(shaders, 'glsl-fs-discard-02')
-add_shader_generic(shaders, 'glsl-fs-discard-03')
-add_shader_generic(shaders, 'glsl-fs-dot-vec2')
-add_shader_generic(shaders, 'glsl-fs-dot-vec2-2')
-add_shader_generic(shaders, 'glsl-fs-exp')
 add_plain_test(shaders, 'glsl-fs-exp2')
 add_plain_test(shaders, 'glsl-fs-flat-color')
-add_shader_generic(shaders, 'glsl-fs-floor')
-add_shader_generic(shaders, 'glsl-fs-f2b')
 add_plain_test(shaders, 'glsl-fs-fragcoord')
-add_shader_generic(shaders, 'glsl-fs-fragdata-1')
-add_shader_generic(shaders, 'glsl-fs-functions-2')
-add_shader_generic(shaders, 'glsl-fs-functions-3')
-add_shader_generic(shaders, 'glsl-fs-functions-4')
-add_shader_generic(shaders, 'glsl-fs-functions-5')
-add_shader_generic(shaders, 'glsl-fs-functions-6')
-add_shader_generic(shaders, 'glsl-fs-functions-samplers')
-add_shader_generic(shaders, 'glsl-fs-i2b')
-add_shader_generic(shaders, 'glsl-fs-if-less')
-add_shader_generic(shaders, 'glsl-fs-if-less-equal')
-add_shader_generic(shaders, 'glsl-fs-if-nested-loop')
-add_shader_generic(shaders, 'glsl-fs-if-greater')
-add_shader_generic(shaders, 'glsl-fs-if-greater-equal')
-add_shader_generic(shaders, 'glsl-fs-if-texture2d-discard')
-add_shader_generic(shaders, 'glsl-fs-implicit-array-size-01')
-add_shader_generic(shaders, 'glsl-fs-implicit-array-size-02')
-add_shader_generic(shaders, 'glsl-fs-implicit-array-size-03')
-add_shader_generic(shaders, 'glsl-fs-log')
-add_shader_generic(shaders, 'glsl-fs-log2')
 add_plain_test(shaders, 'glsl-fs-loop')
-add_shader_generic(shaders, 'glsl-fs-loop-break')
-add_shader_generic(shaders, 'glsl-fs-loop-const-decr')
-add_shader_generic(shaders, 'glsl-fs-loop-const-incr')
-add_shader_generic(shaders, 'glsl-fs-loop-continue')
-add_shader_generic(shaders, 'glsl-fs-loop-ge')
-add_shader_generic(shaders, 'glsl-fs-loop-gt')
-add_shader_generic(shaders, 'glsl-fs-loop-le')
-add_shader_generic(shaders, 'glsl-fs-loop-lt')
 add_plain_test(shaders, 'glsl-fs-loop-nested')
-add_shader_generic(shaders, 'glsl-fs-loop-nested-if')
-add_shader_generic(shaders, 'glsl-fs-loop-redundant-condition')
-add_shader_generic(shaders, 'glsl-fs-loop-two-counter-01')
-add_shader_generic(shaders, 'glsl-fs-loop-two-counter-02')
-add_shader_generic(shaders, 'glsl-fs-loop-two-counter-03')
-add_shader_generic(shaders, 'glsl-fs-loop-two-counter-04')
-add_shader_generic(shaders, 'glsl-fs-loop-zero-iter')
-add_shader_generic(shaders, 'glsl-fs-loop-diagonal-break')
-add_shader_generic(shaders, 'glsl-fs-lots-of-tex')
-add_shader_generic(shaders, 'glsl-fs-max')
-add_shader_generic(shaders, 'glsl-fs-min')
 add_plain_test(shaders, 'glsl-fs-mix')
 add_plain_test(shaders, 'glsl-fs-mix-constant')
-add_shader_generic(shaders, 'glsl-fs-mod')
-add_shader_generic(shaders, 'glsl-fs-neg')
-add_shader_generic(shaders, 'glsl-fs-neg-abs')
-add_shader_generic(shaders, 'glsl-fs-neg-dot')
 add_plain_test(shaders, 'glsl-fs-pointcoord')
-add_shader_generic(shaders, 'glsl-fs-post-increment-01')
 add_plain_test(shaders, 'glsl-fs-raytrace-bug27060')
-add_shader_generic(shaders, 'glsl-fs-roundEven')
-add_shader_generic(shaders, 'glsl-fs-reflect')
 add_plain_test(shaders, 'glsl-fs-sampler-numbering')
-add_shader_generic(shaders, 'glsl-fs-sampler-numbering-2')
-add_shader_generic(shaders, 'glsl-fs-sampler-numbering-3')
 add_plain_test(shaders, 'glsl-fs-shader-stencil-export')
-add_shader_generic(shaders, 'glsl-fs-shadow2d')
-add_shader_generic(shaders, 'glsl-fs-shadow2d-bias')
-add_shader_generic(shaders, 'glsl-fs-shadow2dproj')
-add_shader_generic(shaders, 'glsl-fs-shadow2dproj-bias')
 add_plain_test(shaders, 'glsl-fs-sqrt-branch')
 add_plain_test(shaders, 'glsl-fs-sqrt-zero')
-add_shader_generic(shaders, 'glsl-fs-sign')
-add_shader_generic(shaders, 'glsl-fs-statevar-call')
-add_shader_generic(shaders, 'glsl-fs-struct-equal')
-add_shader_generic(shaders, 'glsl-fs-struct-notequal')
-add_shader_generic(shaders, 'glsl-fs-step')
-add_shader_generic(shaders, 'glsl-fs-swizzle-1')
-add_shader_generic(shaders, 'glsl-fs-tan-1')
-add_shader_generic(shaders, 'glsl-fs-tan-2')
-add_shader_generic(shaders, 'glsl-fs-tan-3')
-add_shader_generic(shaders, 'glsl-fs-texture2d')
-add_shader_generic(shaders, 'glsl-fs-texture2d-bias')
-add_shader_generic(shaders, 'glsl-fs-texture2d-branching')
-add_shader_generic(shaders, 'glsl-fs-texture2d-dependent-1')
-add_shader_generic(shaders, 'glsl-fs-texture2d-dependent-2')
-add_shader_generic(shaders, 'glsl-fs-texture2d-dependent-3')
-add_shader_generic(shaders, 'glsl-fs-texture2d-dependent-4')
-add_shader_generic(shaders, 'glsl-fs-texture2d-dependent-5')
-add_shader_generic(shaders, 'glsl-fs-texture2d-masked')
-add_shader_generic(shaders, 'glsl-fs-texture2d-masked-2')
-add_shader_generic(shaders, 'glsl-fs-texture2d-masked-3')
-add_shader_generic(shaders, 'glsl-fs-texture2d-masked-4')
-add_shader_generic(shaders, 'glsl-fs-texture2dproj')
-add_shader_generic(shaders, 'glsl-fs-texture2dproj-2')
-add_shader_generic(shaders, 'glsl-fs-texture2dproj-bias')
-add_shader_generic(shaders, 'glsl-fs-texture2dproj-bias-2')
 shaders['glsl-fs-texturecube'] = PlainExecTest(['glsl-fs-texturecube',
 					       '-auto'])
 shaders['glsl-fs-texturecube-bias'] = PlainExecTest(['glsl-fs-texturecube',
@@ -494,217 +341,22 @@ shaders['glsl-fs-texture2drect-proj3'] = PlainExecTest(['glsl-fs-texture2drect',
 shaders['glsl-fs-texture2drect-proj4'] = PlainExecTest(['glsl-fs-texture2drect',
 							'-auto', '-proj4'])
 add_plain_test(shaders, 'glsl-fs-texturelod-01')
-add_shader_generic(shaders, 'glsl-fs-trunc')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-1')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-2')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-3')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-4')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-5')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-6')
-add_shader_generic(shaders, 'glsl-fs-uniform-array-7')
-add_shader_generic(shaders, 'glsl-fs-uniform-sampler-array')
-add_shader_generic(shaders, 'glsl-fs-uniform-sampler-struct')
 add_plain_test(shaders, 'glsl-fs-user-varying-ff')
-add_shader_generic(shaders, 'glsl-fs-varying-array')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-1')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-2')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-3')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-4')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-5')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-6')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-dst')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-dst-in-loop')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-dst-in-nested-loop-combined')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-src')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-src-in-loop')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-src-in-nested-loop-inner')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-src-in-nested-loop-outer')
-add_shader_generic(shaders, 'glsl-fs-vec4-indexing-temp-src-in-nested-loop-combined')
-add_shader_generic(shaders, 'glsl-fs-vec4-operator-equal')
-add_shader_generic(shaders, 'glsl-fs-vec4-operator-notequal')
-add_shader_generic(shaders, 'glsl-function-prototype')
-add_shader_generic(shaders, 'glsl-if-assign-call')
-add_shader_generic(shaders, 'glsl-inout-struct-01')
-add_shader_generic(shaders, 'glsl-inout-struct-02')
-add_shader_generic(shaders, 'glsl-invariant-pragma')
-add_shader_generic(shaders, 'glsl-mat-110')
 add_plain_test(shaders, 'glsl-mat-attribute')
-add_shader_generic(shaders, 'glsl-mat-from-int-ctor-01')
-add_shader_generic(shaders, 'glsl-mat-from-int-ctor-02')
-add_shader_generic(shaders, 'glsl-mat-from-int-ctor-03')
-add_shader_generic(shaders, 'glsl-mat-from-vec-ctor-01')
-add_shader_generic(shaders, 'glsl-mat-mul-1')
 add_plain_test(shaders, 'glsl-max-varyings')
-add_shader_generic(shaders, 'glsl-octal')
 add_plain_test(shaders, 'glsl-orangebook-ch06-bump')
-add_shader_generic(shaders, 'glsl-precision-110')
 add_plain_test(shaders, 'glsl-routing')
-add_shader_generic(shaders, 'glsl-struct-constructor-01')
-add_shader_generic(shaders, 'glsl-uniform-initializer-1')
-add_shader_generic(shaders, 'glsl-uniform-initializer-2')
-add_shader_generic(shaders, 'glsl-uniform-initializer-3')
-add_shader_generic(shaders, 'glsl-uniform-initializer-4')
-add_shader_generic(shaders, 'glsl-uniform-initializer-5')
-add_shader_generic(shaders, 'glsl-uniform-initializer-6')
-add_shader_generic(shaders, 'glsl-uniform-initializer-7')
-add_shader_generic(shaders, 'glsl-uniform-linking-1')
-add_shader_generic(shaders, 'glsl-uniform-non-uniform-array-compare')
-add_shader_generic(shaders, 'glsl-uniform-struct')
-add_shader_generic(shaders, 'glsl-varying-mat3x2')
-add_shader_generic(shaders, 'glsl-vec-array')
-add_shader_generic(shaders, 'glsl-version-define')
-add_shader_generic(shaders, 'glsl-version-define-110')
-add_shader_generic(shaders, 'glsl-version-define-120')
-add_shader_generic(shaders, 'glsl-vs-abs-neg')
-add_shader_generic(shaders, 'glsl-vs-all-01')
-add_shader_generic(shaders, 'glsl-vs-all-02')
 add_plain_test(shaders, 'glsl-vs-arrays')
-add_shader_generic(shaders, 'glsl-vs-dot-vec2')
-add_shader_generic(shaders, 'glsl-vs-main-return')
-add_shader_generic(shaders, 'glsl-vs-masked-dot')
-add_shader_generic(shaders, 'glsl-vs-masked-cos')
-add_shader_generic(shaders, 'glsl-vs-neg-abs')
 add_plain_test(shaders, 'glsl-vs-normalscale')
-add_shader_generic(shaders, 'glsl-vs-arrays-2')
-add_shader_generic(shaders, 'glsl-vs-arrays-3')
-add_shader_generic(shaders, 'glsl-vs-array-redeclaration')
-add_shader_generic(shaders, 'glsl-vs-clamp-1')
-add_shader_generic(shaders, 'glsl-vs-cross')
-add_shader_generic(shaders, 'glsl-vs-cross-2')
-add_shader_generic(shaders, 'glsl-vs-cross-3')
-add_shader_generic(shaders, 'glsl-vs-constructor-call')
-add_shader_generic(shaders, 'glsl-vs-f2b')
-add_shader_generic(shaders, 'glsl-vs-ff-frag')
 add_plain_test(shaders, 'glsl-vs-functions')
-add_shader_generic(shaders, 'glsl-vs-functions-2')
-add_shader_generic(shaders, 'glsl-vs-functions-3')
-add_shader_generic(shaders, 'glsl-vs-if-less')
-add_shader_generic(shaders, 'glsl-vs-if-less-equal')
-add_shader_generic(shaders, 'glsl-vs-if-nested')
-add_shader_generic(shaders, 'glsl-vs-if-nested-loop')
-add_shader_generic(shaders, 'glsl-vs-if-greater')
-add_shader_generic(shaders, 'glsl-vs-if-greater-equal')
 add_plain_test(shaders, 'glsl-vs-user-varying-ff')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-dst')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-dst-in-loop')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-dst-in-nested-loop-combined')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-src')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-src-in-loop')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-src-in-nested-loop-inner')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-src-in-nested-loop-outer')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-temp-src-in-nested-loop-combined')
-add_shader_generic(shaders, 'glsl-vs-large-uniform-array')
-add_shader_generic(shaders, 'glsl-vs-mat-add-1')
-add_shader_generic(shaders, 'glsl-vs-mat-div-1')
-add_shader_generic(shaders, 'glsl-vs-mat-div-2')
-add_shader_generic(shaders, 'glsl-vs-mat-mul-1')
-add_shader_generic(shaders, 'glsl-vs-mat-mul-2')
-add_shader_generic(shaders, 'glsl-vs-mat-mul-3')
-add_shader_generic(shaders, 'glsl-vs-mat-sub-1')
-add_shader_generic(shaders, 'glsl-vs-position-outval')
-add_shader_generic(shaders, 'glsl-vs-post-increment-01')
-add_shader_generic(shaders, 'glsl-vs-sign')
-add_shader_generic(shaders, 'glsl-vs-swizzle-swizzle-lhs')
-add_shader_generic(shaders, 'glsl-vs-swizzle-swizzle-rhs')
 add_plain_test(shaders, 'glsl-vs-texturematrix-1')
 add_plain_test(shaders, 'glsl-vs-texturematrix-2')
-add_shader_generic(shaders, 'glsl-vs-uniform-array-1')
-add_shader_generic(shaders, 'glsl-vs-uniform-array-2')
-add_shader_generic(shaders, 'glsl-vs-varying-array')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-1')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-2')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-3')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-4')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-5')
-add_shader_generic(shaders, 'glsl-vs-vec4-indexing-6')
-add_shader_generic(shaders, 'glsl-vs-vec4-operator-equal')
-add_shader_generic(shaders, 'glsl-vs-vec4-operator-notequal')
-add_shader_generic(shaders, 'glsl-texcoord-array')
-add_shader_generic(shaders, 'glsl-texcoord-array-2')
-add_shader_generic(shaders, 'glsl-pp-elif-no-expression-1')
-add_shader_generic(shaders, 'glsl-implicit-conversion-01')
-add_shader_generic(shaders, 'glsl-implicit-conversion-02')
-add_shader_generic(shaders, 'glsl-const-builtin-abs')
-add_shader_generic(shaders, 'glsl-const-builtin-acos')
-add_shader_generic(shaders, 'glsl-const-builtin-all')
-add_shader_generic(shaders, 'glsl-const-builtin-any')
-add_shader_generic(shaders, 'glsl-const-builtin-asin')
-add_shader_generic(shaders, 'glsl-const-builtin-atan')
-add_shader_generic(shaders, 'glsl-const-builtin-ceil')
-add_shader_generic(shaders, 'glsl-const-builtin-clamp')
-add_shader_generic(shaders, 'glsl-const-builtin-cosh')
-add_shader_generic(shaders, 'glsl-const-builtin-cos')
-add_shader_generic(shaders, 'glsl-const-builtin-cross')
-add_shader_generic(shaders, 'glsl-const-builtin-degrees')
-add_shader_generic(shaders, 'glsl-const-builtin-derivatives')
-add_shader_generic(shaders, 'glsl-const-builtin-distance')
-add_shader_generic(shaders, 'glsl-const-builtin-dot')
-add_shader_generic(shaders, 'glsl-const-builtin-equal')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-02')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-03')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-04')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-05')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-06')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-07')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-08')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-09')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-10')
-add_shader_generic(shaders, 'glsl-const-builtin-equal-bool')
-add_shader_generic(shaders, 'glsl-const-builtin-exp')
-add_shader_generic(shaders, 'glsl-const-builtin-exp2')
-add_shader_generic(shaders, 'glsl-const-builtin-faceforward')
-add_shader_generic(shaders, 'glsl-const-builtin-floor')
-add_shader_generic(shaders, 'glsl-const-builtin-fract')
-add_shader_generic(shaders, 'glsl-const-builtin-greaterThanEqual')
-add_shader_generic(shaders, 'glsl-const-builtin-greaterThan')
-add_shader_generic(shaders, 'glsl-const-builtin-inversesqrt')
-add_shader_generic(shaders, 'glsl-const-builtin-length')
-add_shader_generic(shaders, 'glsl-const-builtin-lessThanEqual')
-add_shader_generic(shaders, 'glsl-const-builtin-lessThan')
-add_shader_generic(shaders, 'glsl-const-builtin-log')
-add_shader_generic(shaders, 'glsl-const-builtin-log2')
-add_shader_generic(shaders, 'glsl-const-builtin-matrixCompMult')
-add_shader_generic(shaders, 'glsl-const-builtin-max')
-add_shader_generic(shaders, 'glsl-const-builtin-min')
-add_shader_generic(shaders, 'glsl-const-builtin-mix')
-add_shader_generic(shaders, 'glsl-const-builtin-mod')
-add_shader_generic(shaders, 'glsl-const-builtin-normalize')
-add_shader_generic(shaders, 'glsl-const-builtin-not')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-02')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-03')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-04')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-05')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-06')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-07')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-08')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-09')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-10')
-add_shader_generic(shaders, 'glsl-const-builtin-notEqual-bool')
-add_shader_generic(shaders, 'glsl-const-builtin-outerProduct')
-add_shader_generic(shaders, 'glsl-const-builtin-pow')
-add_shader_generic(shaders, 'glsl-const-builtin-radians')
-add_shader_generic(shaders, 'glsl-const-builtin-reflect')
-add_shader_generic(shaders, 'glsl-const-builtin-refract')
-add_shader_generic(shaders, 'glsl-const-builtin-sign')
-add_shader_generic(shaders, 'glsl-const-builtin-sin')
-add_shader_generic(shaders, 'glsl-const-builtin-smoothstep')
-add_shader_generic(shaders, 'glsl-const-builtin-step')
-add_shader_generic(shaders, 'glsl-const-builtin-sqrt')
-add_shader_generic(shaders, 'glsl-const-builtin-tan')
-add_shader_generic(shaders, 'glsl-const-builtin-transpose')
-add_shader_generic(shaders, 'glsl-const-folding-01')
-add_shader_generic(shaders, 'glsl-const-initializer-01')
-add_shader_generic(shaders, 'glsl-const-initializer-02')
-add_shader_generic(shaders, 'glsl-const-initializer-03')
 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_shader_generic(shaders, 'glsl-vs-loop-break')
-add_shader_generic(shaders, 'glsl-vs-loop-continue')
 add_plain_test(shaders, 'glsl-vs-loop-nested')
-add_shader_generic(shaders, 'glsl-vs-loop-redundant-condition')
 add_plain_test(shaders, 'glsl-vs-mov-after-deref')
 add_plain_test(shaders, 'glsl-vs-raytrace-bug26691')
 add_plain_test(shaders, 'glsl-vs-sqrt-zero')
@@ -722,7 +374,6 @@ add_plain_test(shaders, 'vp-clipdistance-04')
 add_plain_test(shaders, 'vp-combined-image-units')
 add_plain_test(shaders, 'vp-max-array')
 add_plain_test(shaders, 'glsl-derivs')
-add_shader_generic(shaders, 'glsl-derivs-swizzle')
 add_plain_test(shaders, 'glsl-deriv-varyings')
 add_plain_test(shaders, 'glsl-fwidth')
 add_plain_test(shaders, 'glsl-lod-bias')
@@ -731,7 +382,6 @@ 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_shader_generic(shaders, 'glsl-link-array-01')
 add_plain_test(shaders, 'glsl-link-bug30552')
 add_plain_test(shaders, 'glsl-link-empty-prog-01')
 add_plain_test(shaders, 'glsl-link-empty-prog-02')
@@ -744,12 +394,6 @@ add_plain_test(shaders, 'glsl-link-initializer-06')
 add_plain_test(shaders, 'glsl-link-invariant-01')
 add_plain_test(shaders, 'glsl-link-centroid-01')
 add_plain_test(shaders, 'glsl-link-struct-array')
-add_shader_generic(shaders, 'glsl-link-varyings-1')
-add_shader_generic(shaders, 'glsl-link-varyings-2')
-add_shader_generic(shaders, 'glsl-link-varyings-3')
-add_shader_generic(shaders, 'glsl-link-varying-TexCoord')
-add_shader_generic(shaders, 'glsl-override-builtin')
-add_shader_generic(shaders, 'glsl-override-builtin-2')
 add_plain_test(shaders, 'glsl-kwin-blur-1')
 add_plain_test(shaders, 'glsl-kwin-blur-2')
 add_plain_test(shaders, 'gpu_shader4_attribs')
@@ -757,7 +401,6 @@ 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_shader_generic(shaders, 'loopfunc')
 add_plain_test(shaders, 'sso-simple')
 add_plain_test(shaders, 'sso-uniforms-01')
 add_plain_test(shaders, 'sso-uniforms-02')