[Piglit] [PATCH] tests/all.py: Fix bug that erases tests

Dylan Baker baker.dylan.c at gmail.com
Tue Jun 17 08:45:49 PDT 2014


Previously spec['glsl-3.30'] was initialized to {} twice, meaning all
tests added before the second assignment were discarded.

Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
---
 tests/all.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 2c592fe..32c0dec 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1239,9 +1239,6 @@ for subtest in ['unnamed', 'named', 'array']:
         spec['glsl-1.50'],
         'glsl-1.50-interface-block-centroid {0}'.format(subtest))
 
-spec['glsl-3.30'] = {}
-spec['glsl-3.30']['built-in constants'] = concurrent_test('built-in-constants tests/spec/glsl-3.30/minimum-maximums.txt')
-
 # max_vertices of 32 and 128 are important transition points for
 # mesa/i965 (they are the number of bits in a float and a vec4,
 # respectively), so test around there.  Also test 0, which means the
@@ -1291,6 +1288,8 @@ for output_layout in ['points', 'lines', 'lines_adjacency', 'triangles',
                             output_layout))
 
 spec['glsl-3.30'] = {}
+spec['glsl-3.30']['built-in constants'] = concurrent_test('built-in-constants tests/spec/glsl-3.30/minimum-maximums.txt')
+
 import_glsl_parser_tests(spec['glsl-3.30'],
                          os.path.join(testsDir, 'spec', 'glsl-3.30'),
                          ['compiler'])
-- 
2.0.0



More information about the Piglit mailing list