Make test262 test runner check for which exception is thrown

test/test262/testcfg.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 111 matching lines @@
           fullpath = os.path.join(dirname, filename)
           relpath = fullpath[len(self.testroot) + 1 : -3]
           testname = relpath.replace(os.path.sep, "/")
           case = testcase.TestCase(self, testname)
           tests.append(case)
     return tests
 
   def GetFlagsForTestCase(self, testcase, context):
     return (testcase.flags + context.mode_flags + self.harness +
             self.GetIncludesForTest(testcase) + ["--harmony"] +
-            [os.path.join(self.testroot, testcase.path + ".js")])
+            [os.path.join(self.testroot, testcase.path + ".js")] +
+            (["--throws"] if "negative" in self.GetTestRecord(testcase) else []))
 
   def _VariantGeneratorFactory(self):
     return Test262VariantGenerator
 
   def LoadParseTestRecord(self):
     if not self.ParseTestRecord:
       root = os.path.join(self.root, *TEST_262_TOOLS_PATH)
       f = None
       try:
         (f, pathname, description) = imp.find_module("parseTestRecord", [root])
         module = imp.load_module("parseTestRecord", f, pathname, description)
         self.ParseTestRecord = module.parseTestRecord
       except:
         raise ImportError("Cannot load parseTestRecord; you may need to "
-                          "--download-data for test262")
+                          "gclient sync for test262")
       finally:
         if f:
           f.close()
     return self.ParseTestRecord
 
   def GetTestRecord(self, testcase):
     if not hasattr(testcase, "test_record"):
       ParseTestRecord = self.LoadParseTestRecord()
       testcase.test_record = ParseTestRecord(self.GetSourceForTest(testcase),
                                              testcase.path)
     return testcase.test_record
 
   def GetIncludesForTest(self, testcase):
     test_record = self.GetTestRecord(testcase)
     if "includes" in test_record:
       includes = [os.path.join(self.harnesspath, f)
                   for f in test_record["includes"]]
     else:
       includes = []
     return includes
 
   def GetSourceForTest(self, testcase):
     filename = os.path.join(self.testroot, testcase.path + ".js")
     with open(filename) as f:
       return f.read()
 
-  def IsNegativeTest(self, testcase):
+  def _ParseException(self, str):
+    for line in str.split("\n")[::-1]:
+      if line and not line[0].isspace() and ":" in line:
+        return line.split(":")[0]
+
+
+  def IsFailureOutput(self, testcase):
+    output = testcase.output
     test_record = self.GetTestRecord(testcase)
-    return "negative" in test_record
-
-  def IsFailureOutput(self, output, testpath):
     if output.exit_code != 0:
       return True
+    if "negative" in test_record:
+      if self._ParseException(output.stdout) != test_record["negative"]:
+        return True
     return "FAILED!" in output.stdout
 
   def HasUnexpectedOutput(self, testcase):
     outcome = self.GetOutcome(testcase)
     if (statusfile.FAIL_SLOPPY in testcase.outcomes and
         "--use-strict" not in testcase.flags):
       return outcome != statusfile.FAIL
     return not outcome in (testcase.outcomes or [statusfile.PASS])
 
   def DownloadData(self):
@@ skipping 15 matching lines @@
     # data folder.
     if os.path.exists(ARCHIVE) and not os.path.exists(DATA):
       print "Extracting archive..."
       tar = tarfile.open(ARCHIVE)
       tar.extractall(path=os.path.dirname(ARCHIVE))
       tar.close()
 
 
 def GetSuite(name, root):
   return Test262TestSuite(name, root)