Optimized test output checking - avoid redundant checks.

tools/testrunner/local/progress.py

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 39 matching lines @@
 
   def Starting(self):
     pass
 
   def Done(self):
     pass
 
   def AboutToRun(self, test):
     pass
 
-  def HasRun(self, test):
+  def HasRun(self, test, has_unexpected_output):
     pass
 
   def PrintFailureHeader(self, test):
     if test.suite.IsNegativeTest(test):
       negative_marker = '[negative] '
     else:
       negative_marker = ''
     print "=== %(label)s %(negative)s===" % {
       'label': test.GetLabel(),
       'negative': negative_marker
@@ skipping 33 matching lines @@
         print "=== %i tests CRASHED" % self.runner.crashed
       print "==="
 
 
 class VerboseProgressIndicator(SimpleProgressIndicator):
 
   def AboutToRun(self, test):
     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:
         outcome = 'FAIL'
     else:
       outcome = 'pass'
     print 'Done running %s: %s' % (test.GetLabel(), outcome)
 
 
 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()
       elif test.output.HasTimedOut():
         sys.stdout.write('T')
         sys.stdout.flush()
       else:
         sys.stdout.write('F')
         sys.stdout.flush()
     else:
@@ skipping 10 matching lines @@
     self.last_status_length = 0
     self.start_time = time.time()
 
   def Done(self):
     self.PrintProgress('Done')
     print ""  # Line break.
 
   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()
       if len(stdout):
         print self.templates['stdout'] % stdout
       stderr = test.output.stderr.strip()
       if len(stderr):
         print self.templates['stderr'] % stderr
       print "Command: %s" % EscapeCommand(self.runner.GetCommand(test))
       if test.output.HasCrashed():
@@ skipping 74 matching lines @@
 
   def Done(self):
     self.progress_indicator.Done()
     self.outputter.FinishAndWrite(self.outfile)
     if self.outfile != sys.stdout:
       self.outfile.close()
 
   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
       stderr = test.output.stderr.strip()
       if len(stderr):
         fail_text += "stderr:\n%s\n" % stderr
       fail_text += "Command: %s" % EscapeCommand(self.runner.GetCommand(test))
       if test.output.HasCrashed():
         fail_text += "exit code: %d\n--- CRASHED ---" % test.output.exit_code
       if test.output.HasTimedOut():
         fail_text += "--- TIMEOUT ---"
     self.outputter.HasRunTest(
         [test.GetLabel()] + self.runner.context.mode_flags + test.flags,
         test.duration,
         fail_text)
 
 
 PROGRESS_INDICATORS = {
   'verbose': VerboseProgressIndicator,
   'dots': DotsProgressIndicator,
   'color': ColorProgressIndicator,
   'mono': MonochromeProgressIndicator
 }