Make webkit test output comparison compatible to stress testing.

test/webkit/testcfg.py

 # Copyright 2013 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 10 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import itertools
 import os
 import re
-

[Jakob Kummerow, 2013/06/27 16:33:58]

nit: I liked this line, please keep it.

 from testrunner.local import testsuite
 from testrunner.objects import testcase
 
 FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)")
 FILES_PATTERN = re.compile(r"//\s+Files:(.*)")
 SELF_SCRIPT_PATTERN = re.compile(r"//\s+Env: TEST_FILE_NAME")
 
 
 # TODO (machenbach): Share commonalities with mjstest.
 class WebkitTestSuite(testsuite.TestSuite):
@@ skipping 67 matching lines @@
             string.startswith("tools/nacl-run.py") or
             string.find("BYPASSING ALL ACL CHECKS") > 0 or
             string.find("Native Client module will be loaded") > 0 or
             string.find("NaClHostDescOpen:") > 0)
 
   def IsFailureOutput(self, output, testpath):
     if super(WebkitTestSuite, self).IsFailureOutput(output, testpath):
       return True
     file_name = os.path.join(self.root, testpath) + "-expected.txt"
     with file(file_name, "r") as expected:
-      def ExpIterator():
-        for line in expected.readlines():
-          if line.startswith("#") or not line.strip(): continue
-          yield line.strip()
-      def ActIterator():
-        for line in output.stdout.splitlines():
-          if self._IgnoreLine(line.strip()): continue
-          yield line.strip()
+      expected_lines = expected.readlines()
+
+    def ExpIterator():
+      for line in expected_lines:
+        if line.startswith("#") or not line.strip(): continue
+        yield line.strip()
+
+    def ActIterator(lines):
+      for line in lines:
+        if self._IgnoreLine(line.strip()): continue
+        yield line.strip()
+
+    def ActBlockIterator():
+      """Iterates over blocks of actual output lines."""
+      lines = output.stdout.splitlines()
+      start_index = 0
+      found_eqeq = False
+      for index, line in enumerate(lines):
+        # If a stress test separator is found:
+        if line.startswith("=="):
+          # Iterate over all lines before a separator except the first.
+          if not found_eqeq:
+            found_eqeq = True
+          else:
+            yield ActIterator(lines[start_index:index])
+          # The next block of ouput lines starts after the separator.
+          start_index = index + 1
+      # Iterate over complete output if no seperator was found.

[Jakob Kummerow, 2013/06/27 16:33:58]

nit: separator

+      if not found_eqeq:
+        yield ActIterator(lines)
+
+    for act_iterator in ActBlockIterator():
       for (expected, actual) in itertools.izip_longest(
-          ExpIterator(), ActIterator(), fillvalue=''):
+          ExpIterator(), act_iterator, fillvalue=''):
         if expected != actual:
           return True
       return False
 
 
 def GetSuite(name, root):
   return WebkitTestSuite(name, root)