[Piglit] [PATCH 3/5] all.tests: Do a global add_shader_test_dir for generated_tests/spec/

Eric Anholt eric at anholt.net
Wed Apr 18 18:29:49 PDT 2012


We don't have extensions under there, so no per-directory name
mangling is required.  Now people doing new tests (like my 1.40 stuff)
don't need to remember to add the directory.
---
 tests/all.tests |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index c0ba04c..6ec09b1 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -887,9 +887,6 @@ spec['glsl-1.10']['execution'] = Group()
 add_shader_test_dir(spec['glsl-1.10']['execution'],
 	            os.path.join(testsDir, 'spec', 'glsl-1.10', 'execution'),
 		    recursive=True)
-add_shader_test_dir(spec['glsl-1.10']['execution'],
-		    os.path.join(generatedTestDir, 'spec', 'glsl-1.10', 'execution'),
-		    recursive=True)
 for mode in ['fixed', 'pos_clipvert', 'clipvert_pos']:
 	cmdline = 'clip-plane-transformation ' + mode
 	spec['glsl-1.10']['execution']['clipping'][cmdline] = concurrent_test(cmdline)
@@ -909,9 +906,6 @@ spec['glsl-1.20']['execution'] = Group()
 add_shader_test_dir(spec['glsl-1.20']['execution'],
 	            os.path.join(testsDir, 'spec', 'glsl-1.20', 'execution'),
 		    recursive=True)
-add_shader_test_dir(spec['glsl-1.20']['execution'],
-		    os.path.join(generatedTestDir, 'spec', 'glsl-1.20', 'execution'),
-		    recursive=True)
 
 def add_recursion_test(group, name):
 	# When the recursion tests fail it is usually because the GLSL
@@ -968,9 +962,6 @@ add_plain_test(spec['glsl-1.30']['execution'], 'fs-texelFetchOffset-2D')
 add_shader_test_dir(spec['glsl-1.30']['execution'],
 	            os.path.join(testsDir, 'spec', 'glsl-1.30', 'execution'),
 		    recursive=True)
-add_shader_test_dir(spec['glsl-1.30']['execution'],
-		    os.path.join(generatedTestDir, 'spec', 'glsl-1.30', 'execution'),
-		    recursive=True)
 spec['glsl-1.30']['linker'] = Group()
 spec['glsl-1.30']['linker']['clipping'] = Group()
 add_plain_test(spec['glsl-1.30']['linker']['clipping'], 'mixing-clip-distance-and-clip-vertex-disallowed')
@@ -2167,6 +2158,9 @@ add_asmparsertest('ARBvp1.0', 'txq-19.txt')
 add_asmparsertest('ARBvp1.0', 'txq-20.txt')
 add_asmparsertest('ARBvp1.0', 'xpd.txt')
 
+add_shader_test_dir(spec, os.path.join(generatedTestDir, 'spec'),
+		    recursive=True)
+
 profile.tests['bugs'] = bugs
 profile.tests['general'] = general
 profile.tests['hiz'] = hiz
-- 
1.7.10



More information about the Piglit mailing list