summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-04-04 14:16:03 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-05-01 14:30:43 -0700
commitf387aa9a9c96c82aa6eb0eadc7e1d9b8522dda10 (patch)
tree8e2440e530e89ec42fdbe40dcd5fc0e1bc9d64ce
parent31ea649a17df19a612992b29d3bd4751b6b20252 (diff)
tests/quick: fix filtering of vs_in shader tests
This filter is incorrect as is, in that it can mask tests that it can remove tests it shouldn't, for example spec@arb_enhanced_layouts@arb_enhanced_layouts-transform-feedback-layout-qualifiers_vs_interface. Correcting this is problematic because it changes the way the filter works and filter will now remove different tests than it did before. However, it is necessary for a couple of reasons. 1) it's removing tests it shouldn't, 2) this series is going to split reverse the shader.py/all.py relationship, and this bug is going to surface there. The good news is that while this changes the specific tests run, at least on Intel hardware no failures are removed and no failures are added. Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
-rw-r--r--tests/quick.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/quick.py b/tests/quick.py
index 73c467852..2d05d7a44 100644
--- a/tests/quick.py
+++ b/tests/quick.py
@@ -17,6 +17,7 @@ import random
from framework import grouptools
from framework.test import PiglitGLTest
+from framework.test.shader_test import ShaderTest
from tests.all import profile as _profile
__all__ = ['profile']
@@ -32,8 +33,8 @@ class FilterVsIn(object):
self.random = random.Random()
self.random.seed(42)
- def __call__(self, name, _):
- if 'vs_in' in name:
+ def __call__(self, name, test):
+ if isinstance(test, ShaderTest) and 'vs_in' in grouptools.split(name):
# 20%
return self.random.random() <= .2
return True