[test] Key variant flags by variant name everywhere.

test/benchmarks/testcfg.py

Index: test/benchmarks/testcfg.py
diff --git a/test/benchmarks/testcfg.py b/test/benchmarks/testcfg.py
index 2a65037754e862369ff537cbcc41c94876ccf321..d4462746a66ba2237c72ce3ce7652e26b05e8df4 100644
--- a/test/benchmarks/testcfg.py
+++ b/test/benchmarks/testcfg.py
@@ -35,6 +35,14 @@ from testrunner.local import testsuite
 from testrunner.objects import testcase
 
 
+class BenchmarksVariantFlagsBuilder(testsuite.VariantFlagsBuilder):
+  def AllVariants(self, testcase):
+    # Both --nocrankshaft and --stressopt are very slow. Add TF but without
+    # always opt to match the way the benchmarks are run for performance
+    # testing.
+    return self.FastVariants(testcase)
+
+
 class BenchmarksTestSuite(testsuite.TestSuite):
 
   def __init__(self, name, root):
@@ -182,11 +190,8 @@ class BenchmarksTestSuite(testsuite.TestSuite):
 
     os.chdir(old_cwd)
 
-  def VariantFlags(self, testcase, default_flags):
-    # Both --nocrankshaft and --stressopt are very slow. Add TF but without
-    # always opt to match the way the benchmarks are run for performance
-    # testing.
-    return [[], ["--turbo"]]

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

This completely ignored the status file. The new approach will e.g. allow to
limit a single benchmark to no-variants in the status file.

+  def VariantFlagsBuilder(self):
+    return BenchmarksVariantFlagsBuilder
 
 
 def GetSuite(name, root):