[test] Key variant flags by variant name everywhere.

test/test262-es6/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
 #       with the distribution.
 #     * Neither the name of Google Inc. nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # 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 collections
 import hashlib
 import os
 import shutil
 import sys
 import tarfile
 import imp
 
 from testrunner.local import statusfile
 from testrunner.local import testsuite
+from testrunner.local.testsuite import FilterVariants
 from testrunner.local import utils
 from testrunner.objects import testcase
 
 # The revision hash needs to be 7 characters?
 TEST_262_ARCHIVE_REVISION = "c6ac390"  # This is the 2015-07-06 revision.
 TEST_262_ARCHIVE_MD5 = "e1393ef330f38e9cb1bfa4e3eada5ba8"
 TEST_262_URL = "https://github.com/tc39/test262/tarball/%s"
 TEST_262_HARNESS_FILES = ["sta.js", "assert.js"]
 
 TEST_262_SUITE_PATH = ["data", "test"]
 TEST_262_HARNESS_PATH = ["data", "harness"]
 TEST_262_TOOLS_PATH = ["data", "tools", "packaging"]
 
+STRICT_VARIANTS = [
+    (v, flags + ["--use-strict"])
+    for (v, flags) in testsuite.ALL_VARIANTS
+]
+
+STRICT_FAST_VARIANTS = [
+    (v, flags + ["--use-strict"])
+    for (v, flags) in testsuite.FAST_VARIANTS
+]
+
+STRICT_DEFAULT_VARIANT = [
+    (v, flags + ["--use-strict"])
+    for (v, flags) in testsuite.DEFAULT_VARIANT
+]
+
+class Test262VariantFlagsBuilder(testsuite.VariantFlagsBuilder):
+  def __init__(self, suite, variant_filter):
+    super(Test262VariantFlagsBuilder, self).__init__(suite, variant_filter)
+    all_strict = FilterVariants(STRICT_VARIANTS, variant_filter)
+    fast_strict = FilterVariants(STRICT_FAST_VARIANTS, variant_filter)
+    default_strict = FilterVariants(STRICT_DEFAULT_VARIANT, variant_filter)
+

[Michael Achenbach, 2015/07/27 12:37:46]

This precomputes the variants, so that on iteration over the tests, no lists
have to be generated.

+    Variants = collections.namedtuple(
+        'Variants', ['nostrict', 'strict', 'both'])
+    self.default = Variants(
+        self.default_variant,
+        default_strict,
+        self.default_variant + default_strict,
+    )
+    self.fast = Variants(
+        self.fast_variants,
+        fast_strict,
+        self.fast_variants + fast_strict,
+    )
+    self.all = Variants(
+        self.all_variants,
+        all_strict,
+        self.all_variants + all_strict,
+    )
+
+  def _Variant(self, testcase, variants):
+    test_record = self.suite.GetTestRecord(testcase)
+    if "noStrict" in test_record:
+      return variants.nostrict
+    if "onlyStrict" in test_record:
+      return variants.strict
+    return variants.both

[Michael Achenbach, 2015/07/27 12:37:45]

Minor drawback: In the both-case, also after this patch it won't be possible to
only rerun the exact test call. You'll be able to rerun the variant name, e.g.
turbofan and the test runner will execute a nostrict and strict run.

I thought about generalizing also nostrict and strict as named variants that can
be combined with the others, but ran into too many potential test-runner
slow-down and over-design.

+
+  def DefaultVariant(self, testcase):
+    return self._Variant(testcase, self.default)
+
+  def FastVariants(self, testcase):
+    return self._Variant(testcase, self.fast)
+
+  def AllVariants(self, testcase):
+    return self._Variant(testcase, self.all)
+
+
 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.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
@@ skipping 13 matching lines @@
                                   filename[:-3])
           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")])
 
-  def VariantFlags(self, testcase, default_flags):
-    flags = super(Test262TestSuite, self).VariantFlags(testcase, default_flags)
-    test_record = self.GetTestRecord(testcase)
-    if "noStrict" in test_record:
-      return flags
-    strict_flags = [f + ["--use-strict"] for f in flags]
-    if "onlyStrict" in test_record:
-      return strict_flags
-    return flags + strict_flags
+  def VariantFlagsBuilder(self):
+    return Test262VariantFlagsBuilder
 
   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:
@@ skipping 81 matching lines @@
         # Magic incantation to allow longer path names on Windows.
         archive.extractall(u"\\\\?\\%s" % self.root)
       else:
         archive.extractall(self.root)
       os.rename(os.path.join(self.root, "tc39-test262-%s" % revision),
                 directory_name)
 
 
 def GetSuite(name, root):
   return Test262TestSuite(name, root)