Index: buildscripts/newchandler.py =================================================================== --- buildscripts/newchandler.py (revision 11784) +++ buildscripts/newchandler.py (working copy) @@ -301,26 +301,23 @@ outputList = hardhatutil.executeCommandReturnOutput(args) - hardhatutil.dumpOutputList(outputList, log) - - dumpTestLogs(log, chandlerLog, FuncTestLog) - for line in outputList: if line.find('#TINDERBOX# Status = FAIL') >= 0 or \ line.find('#TINDERBOX# Status = UNCHECKED') >= 0: - print "functional tests failed" - log.write("***Error during functional tests***\n") + raise hardhatutil.ExternalCommandErrorWithOutputList([0, outputList]) - forceBuildNextCycle(log, workingDir) + hardhatutil.dumpOutputList(outputList, log) - return "test_failed" + dumpTestLogs(log, chandlerLog, FuncTestLog) except hardhatutil.ExternalCommandErrorWithOutputList, e: - dumpTestLogs(log, chandlerLog, FuncTestLog, e.args) - print "functional tests failed", e log.write("***Error during functional tests***\n") + hardhatutil.dumpOutputList(e.outputList, log) + + dumpTestLogs(log, chandlerLog, FuncTestLog, e.args) + forceBuildNextCycle(log, workingDir) return "test_failed"