diff options
| author | Chad Versace <chad.versace@intel.com> | 2011-03-12 09:35:42 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@intel.com> | 2011-03-12 10:03:59 -0800 |
| commit | 5be0666f4996e9a393b8e10d432a7583c8aa0b87 (patch) | |
| tree | 4ab068ef16ec2f8dec277c65639e9428d5584ed7 | |
| parent | f80a09d150d04c7dc54e4812e28d04e7fbedc266 (diff) | |
all.tests: Blacklist some shader tests that cause memory explosions
Signed-off-by: Chad Versace <chad.versace@intel.com>
| -rw-r--r-- | framework/core.py | 14 | ||||
| -rw-r--r-- | tests/all.tests | 11 |
2 files changed, 25 insertions, 0 deletions
diff --git a/framework/core.py b/framework/core.py index ee7e6eb1a..502b3247f 100644 --- a/framework/core.py +++ b/framework/core.py @@ -399,6 +399,20 @@ class TestProfile: time_end = time.time() env.file.write("time:", time_end-time_start, "\n") + def remove_test(self, test_path): + """Remove a fully qualified test from the profile. + + ``test_path`` is a string with slash ('/') separated + components. It has no leading slash. For example:: + test_path = 'spec/glsl-1.30/linker/do-stuff' + """ + + l = test_path.split('/') + group = self.tests[l[0]] + for group_name in l[1:-2]: + group = group[group_name] + del group[l[-1]] + ############################################################################# ##### Loaders ############################################################################# diff --git a/tests/all.tests b/tests/all.tests index ba6ee225f..cef2af2cb 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -12,6 +12,14 @@ from framework.exectest import * from framework.gleantest import * from framework.glsl_parser_test import GLSLParserTest, add_glsl_parser_test, import_glsl_parser_tests +# Blacklisted tests are removed from the test profile. +blacklist = [ + 'shaders/glsl-fs-unroll-explosion', + 'shaders/glsl-fs-inline-explosion', + 'shaders/glsl-vs-unroll-explosion', + 'shaders/glsl-vs-inline-explosion', + ] + ###### # Collecting all tests profile = TestProfile() @@ -1406,3 +1414,6 @@ Test.ignoreErrors.append(re.compile("GLSL version is .*, but requested version . Test.ignoreErrors.append(re.compile("kCGErrorIllegalArgument: CGSOrderWindowList")) Test.ignoreErrors.append(re.compile("kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint\(\) to catch errors as they are logged.")) +# Remove blacklisted tests +for test_path in blacklist: + profile.remove_test(test_path) |