diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-27 16:47:22 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-28 09:51:07 +0100 |
| commit | ac686c40ad4173f52f144120b6e212b2a6afa8e9 (patch) | |
| tree | 4793742b9782338a749ea8209035090595f46b7d | |
| parent | 5cd8181f9724a5fd90f8a969a16235e31ae3f81d (diff) | |
framework: add returncode parameter to ExecTest.interpretResult
The intel-gpu-tools testrunner needs this to figure out the
testresult (since 'skip' is indicated by a returncode of 77
in i-g-t).
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | framework/exectest.py | 6 | ||||
| -rw-r--r-- | framework/gleantest.py | 2 | ||||
| -rw-r--r-- | tests/gtf.tests | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/framework/exectest.py b/framework/exectest.py index fccea5c8..244d7d99 100644 --- a/framework/exectest.py +++ b/framework/exectest.py @@ -51,7 +51,7 @@ class ExecTest(Test): self.skip_test = self.check_for_skip_scenario(command) - def interpretResult(self, out, results): + def interpretResult(self, out, returncode, results): raise NotImplementedError return out @@ -109,7 +109,7 @@ class ExecTest(Test): results['result'] = 'skip' else: results['result'] = 'fail' - out = self.interpretResult(out, results) + out = self.interpretResult(out, returncode, results) crash_codes = [ # Unix: terminated by a signal @@ -207,7 +207,7 @@ class PlainExecTest(ExecTest): # Prepend testBinDir to the path. self.command[0] = testBinDir + self.command[0] - def interpretResult(self, out, results): + def interpretResult(self, out, returncode, results): outlines = out.split('\n') outpiglit = map(lambda s: s[7:], filter(lambda s: s.startswith('PIGLIT:'), outlines)) diff --git a/framework/gleantest.py b/framework/gleantest.py index bf9a1648..f61f2327 100644 --- a/framework/gleantest.py +++ b/framework/gleantest.py @@ -54,7 +54,7 @@ class GleanTest(ExecTest): self.command += GleanTest.globalParams return ExecTest.run(self, valgrind) - def interpretResult(self, out, results): + def interpretResult(self, out, returncode, results): if out.find('FAIL') >= 0: results['result'] = 'fail' else: diff --git a/tests/gtf.tests b/tests/gtf.tests index 6d865bd0..1d0070a0 100644 --- a/tests/gtf.tests +++ b/tests/gtf.tests @@ -47,7 +47,7 @@ class GTFTest(ExecTest): def __init__(self, testpath): ExecTest.__init__(self, [path.join(testBinDir, 'GTF'), '-noimagefileio', '-width=113', '-height=47', '-seed=2', '-minfmt', '-run=' + testpath]) - def interpretResult(self, out, results): + def interpretResult(self, out, returncode, results): if self.pass_re.search(out) is not None: results['result'] = 'pass' else: |