[Piglit] [PATCH 01/10] all.py: don't add unsupported texwrap test combinations

Marek Olšák maraeo at gmail.com
Mon Jul 27 17:02:30 PDT 2015


From: Marek Olšák <marek.olsak at amd.com>

---
 tests/all.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index de0342f..fbba3b9 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -153,8 +153,9 @@ def add_vpfpgeneric(adder, name):
 def add_texwrap_target_tests(adder, target):
     adder(['texwrap', target, 'GL_RGBA8'],
           'texwrap {}'.format(target))
-    adder(['texwrap', target, 'GL_RGBA8', 'offset'],
-          'texwrap {} offset'.format(target))
+    if target == '2D':
+        adder(['texwrap', target, 'GL_RGBA8', 'offset'],
+              'texwrap {} offset'.format(target))
     adder(['texwrap', target, 'GL_RGBA8', 'bordercolor'],
           'texwrap {} bordercolor'.format(target))
     adder(['texwrap', target, 'GL_RGBA8', 'proj'],
@@ -166,8 +167,9 @@ def add_texwrap_target_tests(adder, target):
 def add_texwrap_format_tests(adder, ext='', suffix=''):
     args = [] if ext == '' else [ext]
     adder(['texwrap'] + args, 'texwrap formats{}'.format(suffix))
-    adder(['texwrap'] + args + ['offset'],
-          'texwrap formats{} offset'.format(suffix))
+    if not 'compression' in ext and not 's3tc' in ext:
+        adder(['texwrap'] + args + ['offset'],
+              'texwrap formats{} offset'.format(suffix))
     adder(['texwrap'] + args + ['bordercolor'],
           'texwrap formats{} bordercolor'.format(suffix))
     adder(['texwrap'] + args + ['bordercolor', 'swizzled'],
-- 
2.1.4



More information about the Piglit mailing list