| Index: tools/testrunner/local/testsuite.py
|
| diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py
|
| index 5dc8debd5cbd2e59f318d43732e7ceedc0e07688..1771fc4f2f3ca8ea3b6acfb5e4e646b7ecfbe280 100644
|
| --- a/tools/testrunner/local/testsuite.py
|
| +++ b/tools/testrunner/local/testsuite.py
|
| @@ -41,7 +41,7 @@
|
| "turbofan": [["--turbo"]],
|
| "turbofan_opt": [["--turbo", "--always-opt"]],
|
| "nocrankshaft": [["--nocrankshaft"]],
|
| - "ignition": [["--ignition"]],
|
| + "ignition": [["--ignition", "--turbo"]],
|
| "ignition_turbofan": [["--ignition", "--turbo"]],
|
| "preparser": [["--min-preparse-length=0"]],
|
| }
|
| @@ -52,7 +52,7 @@
|
| "stress": [["--stress-opt"]],
|
| "turbofan": [["--turbo"]],
|
| "nocrankshaft": [["--nocrankshaft"]],
|
| - "ignition": [["--ignition"]],
|
| + "ignition": [["--ignition", "--turbo"]],
|
| "ignition_turbofan": [["--ignition", "--turbo"]],
|
| "preparser": [["--min-preparse-length=0"]],
|
| }
|
| @@ -62,7 +62,6 @@
|
| "preparser"])
|
| FAST_VARIANTS = set(["default", "turbofan"])
|
| STANDARD_VARIANT = set(["default"])
|
| -IGNITION_VARIANT = set(["ignition"])
|
|
|
|
|
| class VariantGenerator(object):
|
| @@ -73,15 +72,12 @@
|
| self.standard_variant = STANDARD_VARIANT & variants
|
|
|
| def FilterVariantsByTest(self, testcase):
|
| - result = self.all_variants
|
| - if testcase.outcomes:
|
| - if statusfile.OnlyStandardVariant(testcase.outcomes):
|
| - return self.standard_variant
|
| - if statusfile.OnlyFastVariants(testcase.outcomes):
|
| - result = self.fast_variants
|
| - if statusfile.NoIgnitionVariant(testcase.outcomes):
|
| - result -= IGNITION_VARIANT
|
| - return result
|
| + if testcase.outcomes and statusfile.OnlyStandardVariant(
|
| + testcase.outcomes):
|
| + return self.standard_variant
|
| + if testcase.outcomes and statusfile.OnlyFastVariants(testcase.outcomes):
|
| + return self.fast_variants
|
| + return self.all_variants
|
|
|
| def GetFlagSets(self, testcase, variant):
|
| if testcase.outcomes and statusfile.OnlyFastVariants(testcase.outcomes):
|
|
|