| Index: chromium_step.py
|
| ===================================================================
|
| --- chromium_step.py (revision 25340)
|
| +++ chromium_step.py (working copy)
|
| @@ -12,6 +12,7 @@
|
| from buildbot.process import buildstep
|
| from buildbot import slave
|
| from buildbot.steps import shell
|
| +from buildbot.status import builder
|
| from log_parser import process_log
|
|
|
|
|
| @@ -125,14 +126,18 @@
|
| return text_list
|
|
|
| def evaluateCommand(self, cmd):
|
| - # If the log processor provides a facility to evaluate its performance,
|
| - # call it.
|
| - if self._log_processor and self._log_processor.evaluateCommand:
|
| - return self._log_processor.evaluateCommand(cmd)
|
| + result = None
|
|
|
| - # Otherwise, report success by default.
|
| - return builder.SUCCESS
|
| + # If the log processor provides an evaluateCommand method, call it.
|
| + if self._log_processor and 'evaluateCommand' in dir(self._log_processor):
|
| + result = self._log_processor.evaluateCommand(cmd)
|
|
|
| + if result is None or result is builder.SUCCESS:
|
| + # Report success of parent command.
|
| + result = shell.ShellCommand.evaluateCommand(self, cmd)
|
| +
|
| + return result
|
| +
|
| def _CreateReportLinkIfNeccessary(self):
|
| if self._log_processor.ReportLink():
|
| self.addURL('results', "%s" % self._log_processor.ReportLink())
|
|
|