[test] Enable test status filtering by variant

tools/testrunner/local/testsuite.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 114 matching lines @@
   def status_file(self):
     return "%s/%s.status" % (self.root, self.name)
 
   # Used in the status file and for stdout printing.
   def CommonTestName(self, testcase):
     if utils.IsWindows():
       return testcase.path.replace("\\", "/")
     else:
       return testcase.path
 
+  def VirtualTestName(self, testcase):
+    """Returns the test path prefixed with the variant name."""
+    return "virtual/%s/%s" % (testcase.variant, self.CommonTestName(testcase))
+
   def ListTests(self, context):
     raise NotImplementedError
 
   def _VariantGeneratorFactory(self):
     """The variant generator class to be used."""
     return VariantGenerator
 
   def CreateVariantGenerator(self, variants):
     """Return a generator for the testing variants of this suite.
 
@@ skipping 17 matching lines @@
   @staticmethod
   def _FilterSlow(slow, mode):
     return (mode == "run" and not slow) or (mode == "skip" and slow)
 
   @staticmethod
   def _FilterPassFail(pass_fail, mode):
     return (mode == "run" and not pass_fail) or (mode == "skip" and pass_fail)
 
   def FilterTestCasesByStatus(self, warn_unused_rules,
                               slow_tests="dontcare",
-                              pass_fail_tests="dontcare"):
+                              pass_fail_tests="dontcare",
+                              virtual=False):
+
+    # Use only virtual rules and wildcards when filtering virtual test cases
+    # and generic rules when filtering generic test cases.
+    filter_virtual = lambda d: {k:v for k,v in d.iteritems()
+                               if not(virtual ^ k.startswith("virtual/"))}
+    rules = filter_virtual(self.rules)
+    wildcards = filter_virtual(self.wildcards)
+
     filtered = []
     used_rules = set()
     for t in self.tests:
       slow = False
       pass_fail = False
-      testname = self.CommonTestName(t)
-      if testname in self.rules:
+      testname = self.VirtualTestName(t) if virtual else self.CommonTestName(t)
+      if testname in rules:
         used_rules.add(testname)
         # Even for skipped tests, as the TestCase object stays around and
         # PrintReport() uses it.
-        t.outcomes = self.rules[testname]
+        t.outcomes = rules[testname]
         if statusfile.DoSkip(t.outcomes):
           continue  # Don't add skipped tests to |filtered|.
         for outcome in t.outcomes:
           if outcome.startswith('Flags: '):
             t.flags += outcome[7:].split()
         slow = statusfile.IsSlow(t.outcomes)
         pass_fail = statusfile.IsPassOrFail(t.outcomes)
       skip = False
-      for rule in self.wildcards:
+      for rule in wildcards:
         assert rule[-1] == '*'
         if testname.startswith(rule[:-1]):
           used_rules.add(rule)
-          t.outcomes |= self.wildcards[rule]
+          t.outcomes |= wildcards[rule]
           if statusfile.DoSkip(t.outcomes):
             skip = True
-            break  # "for rule in self.wildcards"
+            break  # "for rule in wildcards"
           slow = slow or statusfile.IsSlow(t.outcomes)
           pass_fail = pass_fail or statusfile.IsPassOrFail(t.outcomes)
       if (skip
           or self._FilterSlow(slow, slow_tests)
           or self._FilterPassFail(pass_fail, pass_fail_tests)):
         continue  # "for t in self.tests"
       filtered.append(t)
     self.tests = filtered
 
     if not warn_unused_rules:
       return
 
-    for rule in self.rules:
+    for rule in rules:
       if rule not in used_rules:
-        print("Unused rule: %s -> %s" % (rule, self.rules[rule]))
-    for rule in self.wildcards:
+        print("Unused rule: %s -> %s" % (rule, rules[rule]))
+    for rule in wildcards:
       if rule not in used_rules:
-        print("Unused rule: %s -> %s" % (rule, self.wildcards[rule]))
+        print("Unused rule: %s -> %s" % (rule, wildcards[rule]))
 
   def FilterTestCasesByArgs(self, args):
     """Filter test cases based on command-line arguments.
 
     An argument with an asterisk in the end will match all test cases
     that have the argument as a prefix. Without asterisk, only exact matches
     will be used with the exeption of the test-suite name as argument.
     """
     filtered = []
     globs = []
@@ skipping 102 matching lines @@
     return (testcase.flags + ["--gtest_filter=" + testcase.path] +
             ["--gtest_random_seed=%s" % context.random_seed] +
             ["--gtest_print_time=0"] +
             context.mode_flags)
 
   def _VariantGeneratorFactory(self):
     return StandardVariantGenerator
 
   def shell(self):
     return self.name