[Piglit] [PATCH 6/7] tests/all.py: Don't add glsl-1.50 TextureSize tests twice

Dylan Baker baker.dylan.c at gmail.com
Thu Mar 5 11:34:23 PST 2015


Because gs is a 1.50 features, but is added in the 1.30 and 1.40 loops
it currently adds the same tests twice. This corrects that.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 7fbfea5..ff61369 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1337,12 +1337,17 @@ for stage in ['vs', 'gs', 'fs']:
         version = '1.50'
     else:
         version = '1.30'
+
     # textureSize():
-    for sampler in textureSize_samplers_130:
-        profile.test_list[grouptools.join(
-            'spec', 'glsl-{}'.format(version), 'execution', 'textureSize',
-            '{}-textureSize-{}'.format(stage, sampler))] = PiglitGLTest(
-                ['textureSize', stage, sampler])
+    # These will be added in the textureSize_samplers_140 loop for gs, because
+    # it is a special case and is actually 1.50 feature.
+    if stage is not 'gs':
+        for sampler in textureSize_samplers_130:
+            profile.test_list[grouptools.join(
+                'spec', 'glsl-{}'.format(version), 'execution', 'textureSize',
+                '{}-textureSize-{}'.format(stage, sampler))] = PiglitGLTest(
+                    ['textureSize', stage, sampler])
+
     # texelFetch():
     for sampler in ['sampler1D', 'sampler2D', 'sampler3D', 'sampler1DArray', 'sampler2DArray', 'isampler1D', 'isampler2D', 'isampler3D', 'isampler1DArray', 'isampler2DArray', 'usampler1D', 'usampler2D', 'usampler3D', 'usampler1DArray', 'usampler2DArray']:
         profile.test_list[grouptools.join(
@@ -1353,6 +1358,7 @@ for stage in ['vs', 'gs', 'fs']:
             'spec', 'glsl-{}'.format(version), 'execution', 'texelFetchOffset',
             '{}-texelFetch-{}'.format(stage, sampler))] = PiglitGLTest(
                 ['texelFetch', 'offset', stage, sampler])
+
     # texelFetch() with EXT_texture_swizzle mode "b0r1":
     for type in ['i', 'u', '']:
         profile.test_list[grouptools.join(
-- 
2.3.1



More information about the Piglit mailing list