summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-07-27 21:04:05 +0200
committerMarek Olšák <marek.olsak@amd.com>2015-07-29 21:43:48 +0200
commita27bc4fb308c4c32f9b89fa88900cbcffbed2c2b (patch)
treeb19373b249f89ddfa45610930f63de227cd29010
parent6ca74fa2fc81e3154d3860ecc77418b93f7adda8 (diff)
all.py: don't add unsupported texwrap test combinations
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--tests/all.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/all.py b/tests/all.py
index 3106c33e8..45fb00dfb 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 'compression' not in ext and 's3tc' not 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'],