Signed-off-by: Dylan Baker <[email protected]>
---
tests/all.py | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/tests/all.py b/tests/all.py
index 8d4c989..2102cbd 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# All tests that come with piglit, using default settings
-#
+
__all__ = ['profile']
import itertools
@@ -3296,7 +3296,7 @@ oes_matrix_get['All queries'] =
PiglitGLTest(['oes_matrix_get-api'], run_concurr
oes_fixed_point = spec['OES_fixed_point']
oes_fixed_point['attribute-arrays'] =
PiglitGLTest(['oes_fixed_point-attribute-arrays'], run_concurrent=True)
-spec['OES_standard_derivatives'] =
import_glsl_parser_tests(spec['OES_standard_derivatives'],
+import_glsl_parser_tests(spec['OES_standard_derivatives'],
os.path.join(TESTS_DIR, 'spec',
'oes_standard_derivatives'),
['compiler'])
@@ -3544,24 +3544,12 @@ ext_polygon_offset_clamp =
spec['EXT_polygon_offset_clamp']
add_concurrent_test(ext_polygon_offset_clamp,
['ext_polygon_offset_clamp-draw'])
add_concurrent_test(ext_polygon_offset_clamp,
['ext_polygon_offset_clamp-dlist'])
-# group glslparsertest ------------------------------------------------------
-glslparsertest = profile.tests['glslparsertest']
-# Add all shader source files in the directories below.
-for filename in os.listdir(os.path.join(TESTS_DIR, 'glslparsertest',
'shaders')):
- ext = filename.rsplit('.')[-1]
- if ext in ['vert', 'geo', 'frag']:
- add_glsl_parser_test(
- glslparsertest,
- os.path.join(TESTS_DIR, 'glslparsertest', 'shaders', filename),
- filename)
-for filename in os.listdir(os.path.join(TESTS_DIR, 'glslparsertest', 'glsl2')):
- ext = filename.rsplit('.')[-1]
- if ext in ['vert', 'geo', 'frag']:
- add_glsl_parser_test(
- glslparsertest,
- os.path.join(TESTS_DIR, 'glslparsertest', 'glsl2', filename),
- grouptools.join('glsl2', filename))
-# end group glslparsertest ---------------------------------------------------
+import_glsl_parser_tests(profile.tests['glslparsertest']['glsl2'],
+ os.path.join(TESTS_DIR, 'glslparsertest', 'glsl2'),
+ [''])
+import_glsl_parser_tests(profile.tests['glslparsertest'],
+ os.path.join(TESTS_DIR, 'glslparsertest', 'shaders'),
+ [''])
hiz = profile.tests['hiz']
add_plain_test(hiz, ['hiz-depth-stencil-test-fbo-d0-s8'])
@@ -4212,7 +4200,6 @@ arb_shader_image_load_store['unused'] =
PiglitGLTest(['arb_shader_image_load_sto
profile.tests['hiz'] = hiz
profile.tests['fast_color_clear'] = fast_color_clear
profile.tests['glean'] = glean
-profile.tests['glslparsertest'] = glslparsertest
profile.tests['shaders'] = shaders
profile.tests['security'] = security
profile.tests['spec'] = spec
--
2.3.0
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
