[Piglit] [PATCH 12/13] all.tests: Add all tests *.shader_test_gles3

Chad Versace chad.versace at linux.intel.com
Mon Dec 3 21:59:40 PST 2012


all.tests already auto-detects all files named *.shader_test, and runs
them with shader_runner. This patch does the same for files
*.shader_test_gles3 and runs them with shader_runner_gles3.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/all.tests | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 5475a2a..5450ae5 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -201,10 +201,16 @@ def add_shader_test_dir(group, dirpath, recursive=False):
 			add_shader_test_dir(group[filename], filepath, recursive)
 		else:
 			ext = filename.rsplit('.')[-1]
-			if ext != 'shader_test':
+
+			if ext == 'shader_test':
+				runner = 'shader_runner'
+			elif ext == 'shader_test_gles3':
+				runner = 'shader_runner_gles3'
+			else:
 				continue
+
 			testname = filename[0:-(len(ext) + 1)] # +1 for '.'
-			group[testname] = concurrent_test('shader_runner ' + filepath)
+			group[testname] = concurrent_test(runner + ' ' + filepath)
 
 def add_getactiveuniform_count(group, name, expected):
 	path = 'shaders/'
@@ -827,9 +833,13 @@ for stage in ['vs', 'fs']:
 
 # Group spec/glsl-es-3.00
 spec['glsl-es-3.00'] = Group()
+spec['glsl-es-3.00']['execution'] = Group()
 import_glsl_parser_tests(spec['glsl-es-3.00'],
 			 os.path.join(testsDir, 'spec', 'glsl-es-3.00'),
 			 ['compiler'])
+add_shader_test_dir(spec['glsl-es-3.00']['execution'],
+	            os.path.join(testsDir, 'spec', 'glsl-es-3.00', 'execution'),
+		    recursive=True)
 
 
 # Group AMD_conservative_depth
-- 
1.7.11.7



More information about the Piglit mailing list