Make test262 test runner check for which exception is thrown

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 99 matching lines @@
             string.startswith("DEBUG MODE ENABLED") or
             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 or
             # FIXME(machenbach): The test driver shouldn't try to use slow
             # asserts if they weren't compiled. This fails in optdebug=2.
             string == "Warning: unknown flag --enable-slow-asserts." or
             string == "Try --help for options")
 
-  def IsFailureOutput(self, output, testpath):
-    if super(WebkitTestSuite, self).IsFailureOutput(output, testpath):
+  def IsFailureOutput(self, testcase):
+    if super(WebkitTestSuite, self).IsFailureOutput(testcase):
       return True
-    file_name = os.path.join(self.root, testpath) + "-expected.txt"
+    file_name = os.path.join(self.root, testcase.testpath) + "-expected.txt"

[Michael Achenbach, 2016/03/10 12:16:31]

testcase.path

[Dan Ehrenberg, 2016/03/10 20:08:19]

Fixed

     with file(file_name, "r") as expected:
       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()
+      lines = testcase.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.
+          # The next block of output lines starts after the separator.
           start_index = index + 1
       # Iterate over complete output if no separator was found.
       if not found_eqeq:
         yield ActIterator(lines)
 
     for act_iterator in ActBlockIterator():
       for (expected, actual) in itertools.izip_longest(
           ExpIterator(), act_iterator, fillvalue=''):
         if expected != actual:
           return True
       return False
 
 
 def GetSuite(name, root):
   return WebkitTestSuite(name, root)