Detach ArrayBuffer in test262

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 25 matching lines @@
 
 from testrunner.local import statusfile
 from testrunner.local import testsuite
 from testrunner.local import utils
 from testrunner.objects import testcase
 
 DATA = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data")
 ARCHIVE = DATA + ".tar"
 
 TEST_262_HARNESS_FILES = ["sta.js", "assert.js"]
+TEST_262_NATIVE_FILES = ["detachArrayBuffer.js"]
 
 TEST_262_SUITE_PATH = ["data", "test"]
 TEST_262_HARNESS_PATH = ["data", "harness"]
 TEST_262_TOOLS_PATH = ["data", "tools", "packaging"]
 
 ALL_VARIANT_FLAGS_STRICT = dict(
     (v, [flags + ["--use-strict"] for flags in flag_sets])
     for v, flag_sets in testsuite.ALL_VARIANT_FLAGS.iteritems()
 )
 
@@ skipping 68 matching lines @@
           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"] +
             (["--module"] if "module" in self.GetTestRecord(testcase) else []) +
             [os.path.join(self.testroot, testcase.path + ".js")] +
-            (["--throws"] if "negative" in self.GetTestRecord(testcase) else []))
+            (["--throws"] if "negative" in self.GetTestRecord(testcase)
+                          else []) +
+            (["--allow-natives-syntax"]
+             if "detachArrayBuffer.js" in
+                self.GetTestRecord(testcase).get("includes", [])
+             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 "
                           "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 BasePath(self, filename):
+    return self.root if filename in TEST_262_NATIVE_FILES else self.harnesspath
+
   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"]]
+      return [os.path.join(self.BasePath(filename), filename)
+              for filename in test_record.get("includes", [])]

[Michael Achenbach, 2016/04/21 07:23:49]

But you didn't fully add the other simplification I suggested, or is it wrong?
If you add the [] default to test_record.get, the resulting list comprehension
will create an empty list too if "includes" is not in test_record. So the whole
code could be:

test_record = self.GetTestRecord(testcase)
return [os.path.join(self.BasePath(filename), filename)
  for filename in test_record.get("includes", [])]

And that's it.

[Dan Ehrenberg, 2016/04/21 07:29:36]

Oh, I misunderstood somehow. I'll do this in a follow-on patch.

     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 _ParseException(self, str):
@@ skipping 38 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)