[test262] Use standalone Test262 harness project

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 15 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 import hashlib
 import imp
 import os
 import shutil
 import sys
 import tarfile
 
-
 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"
+HARNESS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "harness")
+
+# add parent dir to search path to get the harness files
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+# In --donwload-data mode, HARNESS may be added later; import if present
+if os.path.exists(HARNESS):
+  from harness import parseTestRecord

[tandrii(chromium), 2016/07/20 10:42:01]

IMO, the previous version of lazy import is much better. Is there any reason you
had to switch to this?

+
+DATA_ARCHIVE = DATA + ".tar"
+HARNESS_ARCHIVE = HARNESS + ".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"]
+TEST_262_INCLUDES_PATH = ["data", "harness"]
 
 ALL_VARIANT_FLAGS_STRICT = dict(
     (v, [flags + ["--use-strict"] for flags in flag_sets])
     for v, flag_sets in testsuite.ALL_VARIANT_FLAGS.iteritems()
 )
 
 FAST_VARIANT_FLAGS_STRICT = dict(
     (v, [flags + ["--use-strict"] for flags in flag_sets])
     for v, flag_sets in testsuite.FAST_VARIANT_FLAGS.iteritems()
 )
@@ skipping 35 matching lines @@
     if "onlyStrict" in test_record:
       return variant_flags["strict"][variant]
     return variant_flags["both"][variant]
 
 
 class Test262TestSuite(testsuite.TestSuite):
 
   def __init__(self, name, root):
     super(Test262TestSuite, self).__init__(name, root)
     self.testroot = os.path.join(self.root, *TEST_262_SUITE_PATH)
-    self.harnesspath = os.path.join(self.root, *TEST_262_HARNESS_PATH)
+    self.harnesspath = os.path.join(self.root, *TEST_262_INCLUDES_PATH)
     self.harness = [os.path.join(self.harnesspath, f)
                     for f in TEST_262_HARNESS_FILES]
     self.harness += [os.path.join(self.root, "harness-adapt.js")]
-    self.ParseTestRecord = None
 
   def ListTests(self, context):
     tests = []
     for dirname, dirs, files in os.walk(self.testroot):
       for dotted in [x for x in dirs if x.startswith(".")]:
         dirs.remove(dotted)
       if context.noi18n and "intl402" in dirs:
         dirs.remove("intl402")
       dirs.sort()
       files.sort()
@@ skipping 14 matching lines @@
             (["--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")

[tandrii(chromium), 2016/07/20 10:42:01]

I would keep user friendly "ImportError", unless you are certain it never
happens (and I am not)

[Michael Achenbach, 2016/07/20 11:22:49]

You could also just move this code to toplevel at the beginning of this script.
But this looks like a refactoring and wouldn't be really needed for the main
change in this CL. Could you send it in a separate CL?

-      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.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:
       return [os.path.join(self.BasePath(filename), filename)
@@ skipping 40 matching lines @@
 
     archive_files = [f for f in os.listdir(self.root)
                      if f.startswith("tc39-test262-")]
     if len(archive_files) > 0:
       print "Clobber outdated test archives ..."
       for f in archive_files:
         os.remove(os.path.join(self.root, f))
 
     # The archive is created only on swarming. Local checkouts have the
     # data folder.
-    if os.path.exists(ARCHIVE) and not os.path.exists(DATA):
+    if os.path.exists(DATA_ARCHIVE) and not os.path.exists(DATA):
       print "Extracting archive..."
-      tar = tarfile.open(ARCHIVE)
-      tar.extractall(path=os.path.dirname(ARCHIVE))
+      tar = tarfile.open(DATA_ARCHIVE)
+      tar.extractall(path=os.path.dirname(DATA_ARCHIVE))
       tar.close()
 
+    if os.path.exists(HARNESS_ARCHIVE) and not os.path.exists(HARNESS):
+      print "Extracting harness..."
+      tar = tarfile.open(HARNESS_ARCHIVE)
+      tar.extractall(path=os.path.dirname(HARNESS_ARCHIVE))
+      tar.close()
+
+    global parseTestRecord
+    from harness import parseTestRecord
+
 
 def GetSuite(name, root):
   return Test262TestSuite(name, root)