[Piglit] [PATCH 1/4] framework: add returncode parameter to ExecTest.interpretResult
Daniel Vetter
daniel.vetter at ffwll.ch
Tue Nov 27 11:52:45 PST 2012
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 at ffwll.ch>
---
framework/exectest.py | 6 +++---
framework/gleantest.py | 2 +-
tests/gtf.tests | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/framework/exectest.py b/framework/exectest.py
index fccea5c..244d7d9 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 bf9a164..f61f232 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 6d865bd..1d0070a 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:
--
1.7.11.7
More information about the Piglit
mailing list