aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-02-19 11:42:29 -0800
committerEric Anholt <eric@anholt.net>2013-04-12 16:05:35 -0700
commitff0ac2938b1801ae264409d68bc2fb463e9b41ac (patch)
tree5b1a76904e891e25230500e77f367b0fc3c26b43
parent06ada3c9a345fdb3e292cbe04ed053c8c632bdc4 (diff)
gtf: Parse either the old or new GLES conformance suite output.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--tests/gtf.tests2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/gtf.tests b/tests/gtf.tests
index 4cbbd2cd..2a72ef83 100644
--- a/tests/gtf.tests
+++ b/tests/gtf.tests
@@ -42,7 +42,7 @@ if not os.path.exists(os.path.join(testBinDir, 'GTF')):
gtfroot = path.dirname(path.realpath(path.join(testBinDir, 'GTF')))
class GTFTest(ExecTest):
- pass_re = re.compile(r'Regression PASSED all 1 tests')
+ pass_re = re.compile(r'(Regression|Conformance) PASSED all 1 tests')
def __init__(self, testpath):
ExecTest.__init__(self, [path.join(testBinDir, 'GTF'), '-width=113', '-height=47', '-seed=2', '-minfmt', '-run=' + testpath])