| Index: tools/testrunner/local/progress.py
|
| diff --git a/tools/testrunner/local/progress.py b/tools/testrunner/local/progress.py
|
| index c13c0eb54e3c36e9753ee01bdf9373b74abf7262..a663be23eba8714fea65d1a30e71ecdeebcf759b 100644
|
| --- a/tools/testrunner/local/progress.py
|
| +++ b/tools/testrunner/local/progress.py
|
| @@ -57,7 +57,7 @@ class ProgressIndicator(object):
|
| def AboutToRun(self, test):
|
| pass
|
|
|
| - def HasRun(self, test):
|
| + def HasRun(self, test, has_unexpected_output):
|
| pass
|
|
|
| def PrintFailureHeader(self, test):
|
| @@ -111,8 +111,8 @@ class VerboseProgressIndicator(SimpleProgressIndicator):
|
| print 'Starting %s...' % test.GetLabel()
|
| sys.stdout.flush()
|
|
|
| - def HasRun(self, test):
|
| - if test.suite.HasUnexpectedOutput(test):
|
| + def HasRun(self, test, has_unexpected_output):
|
| + if has_unexpected_output:
|
| if test.output.HasCrashed():
|
| outcome = 'CRASH'
|
| else:
|
| @@ -124,11 +124,11 @@ class VerboseProgressIndicator(SimpleProgressIndicator):
|
|
|
| class DotsProgressIndicator(SimpleProgressIndicator):
|
|
|
| - def HasRun(self, test):
|
| + def HasRun(self, test, has_unexpected_output):
|
| total = self.runner.succeeded + len(self.runner.failed)
|
| if (total > 1) and (total % 50 == 1):
|
| sys.stdout.write('\n')
|
| - if test.suite.HasUnexpectedOutput(test):
|
| + if has_unexpected_output:
|
| if test.output.HasCrashed():
|
| sys.stdout.write('C')
|
| sys.stdout.flush()
|
| @@ -159,8 +159,8 @@ class CompactProgressIndicator(ProgressIndicator):
|
| def AboutToRun(self, test):
|
| self.PrintProgress(test.GetLabel())
|
|
|
| - def HasRun(self, test):
|
| - if test.suite.HasUnexpectedOutput(test):
|
| + def HasRun(self, test, has_unexpected_output):
|
| + if has_unexpected_output:
|
| self.ClearLine(self.last_status_length)
|
| self.PrintFailureHeader(test)
|
| stdout = test.output.stdout.strip()
|
| @@ -255,10 +255,10 @@ class JUnitTestProgressIndicator(ProgressIndicator):
|
| def AboutToRun(self, test):
|
| self.progress_indicator.AboutToRun(test)
|
|
|
| - def HasRun(self, test):
|
| - self.progress_indicator.HasRun(test)
|
| + def HasRun(self, test, has_unexpected_output):
|
| + self.progress_indicator.HasRun(test, has_unexpected_output)
|
| fail_text = ""
|
| - if test.suite.HasUnexpectedOutput(test):
|
| + if has_unexpected_output:
|
| stdout = test.output.stdout.strip()
|
| if len(stdout):
|
| fail_text += "stdout:\n%s\n" % stdout
|
|
|