Mercurial > hg > truffle
changeset 4332:9dbcdd6f1464
If a benchmark fails it should fail hard, not silently
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Thu, 26 Jan 2012 19:12:00 +0100 |
| parents | daaee28c65c6 |
| children | ca48212b7681 |
| files | mx/sanitycheck.py |
| diffstat | 1 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/sanitycheck.py Thu Jan 26 18:32:02 2012 +0100 +++ b/mx/sanitycheck.py Thu Jan 26 19:12:00 2012 +0100 @@ -161,6 +161,9 @@ result = parser.parse(vm, self.vmOpts + opts + self.cmd, cwd, vmbuild) parsedLines = result['parsed'] + if len(parsedLines) == 0: + return False + assert len(parsedLines) == 1, 'Test matchers should not return more than one line' parsed = parsedLines[0] @@ -174,7 +177,7 @@ os.unlink(parsed['jvmError']) return False - if parsed.has_key('failed') and parsed['failed'] is 1: + if parsed.has_key('failed') and parsed['failed'] is '1': return False return result['retcode'] is 0 and parsed.has_key('passed') and parsed['passed'] is '1' @@ -187,6 +190,8 @@ cwd = self.defaultCwd parser = OutputParser(nonZeroIsFatal = False) + for successRE in self.successREs: + parser.addMatcher(Matcher(successRE, {'const:passed' : 'const:1'})) for failureRE in self.failureREs: parser.addMatcher(Matcher(failureRE, {'const:failed' : 'const:1'})) for scoreMatcher in self.scoreMatchers: @@ -194,16 +199,23 @@ result = parser.parse(vm, self.vmOpts + opts + self.cmd, cwd, vmbuild) if result['retcode'] is not 0: - return {} + mx.abort("Benchmark failed (non-zero retcode)") parsed = result['parsed'] ret = {} + passed = False; + for line in parsed: - assert line.has_key('name') and line.has_key('score') - if line.has_key('failed') and parsed['failed'] is 1: - return {} + assert (line.has_key('name') and line.has_key('score')) or line.has_key('passed') + if line.has_key('failed') and line['failed'] is '1': + mx.abort("Benchmark failed") + if line.has_key('passed') and line['passed'] is '1': + passed = True ret[line['name']] = line['score'] + if not passed: + mx.abort("Benchmark failed (not passed)") + return ret