[test] Run benchmarks in more variants

TBR=sergiyb@chromium.org

Bug: v8:7337
Change-Id: Ie2f8f9082d2de65b77d1da11ff3569052bf2aed4
Reviewed-on: https://chromium-review.googlesource.com/877880
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50740}

test/benchmarks/benchmarks.status

@@ -37,6 +37,12 @@
   'octane/typescript': [PASS, SLOW],
 }],  # ALWAYS
 
+['variant == stress', {
+  # Too slow for stress mode.
+  'octane/mandreel': [SKIP],
+  'octane/typescript': [SKIP],
+}],
+
 ['gc_fuzzer', {
   # Too slow for gc fuzzing.
   'octane/earley-boyer' : [PASS, SLOW, ['mode == debug', SKIP]],

test/benchmarks/testcfg.py

@@ -34,11 +34,6 @@ from testrunner.local import testsuite
 from testrunner.objects import testcase
 
 
-class VariantsGenerator(testsuite.VariantsGenerator):
-  def _get_variants(self, test):
-    return self._standard_variant
-
-
 class TestSuite(testsuite.TestSuite):
   def __init__(self, name, root):
     super(TestSuite, self).__init__(name, root)
@@ -109,12 +104,6 @@ class TestSuite(testsuite.TestSuite):
   def _test_class(self):
     return TestCase
 
-  def _variants_gen_class(self):
-    return VariantsGenerator
-
-  def _LegacyVariantsGeneratorFactory(self):
-    return testsuite.StandardLegacyVariantsGenerator
-
 
 class TestCase(testcase.TestCase):
   def _get_files_params(self, ctx):