Revision: 25150
Author:   [email protected]
Date:     Wed Nov  5 13:05:28 2014 UTC
Log:      Fix fast-variants feature in test driver.

BUG=
[email protected]

Review URL: https://codereview.chromium.org/701933003
https://code.google.com/p/v8/source/detail?r=25150

Modified:
 /branches/bleeding_edge/tools/run-tests.py
 /branches/bleeding_edge/tools/testrunner/local/testsuite.py

=======================================
--- /branches/bleeding_edge/tools/run-tests.py  Mon Oct 27 14:36:36 2014 UTC
+++ /branches/bleeding_edge/tools/run-tests.py  Wed Nov  5 13:05:28 2014 UTC
@@ -44,6 +44,7 @@
 from testrunner.local import execution
 from testrunner.local import progress
 from testrunner.local import testsuite
+from testrunner.local.testsuite import VARIANT_FLAGS
 from testrunner.local import utils
 from testrunner.local import verbose
 from testrunner.network import network_execution
@@ -82,13 +83,6 @@
 TIMEOUT_DEFAULT = 60
 TIMEOUT_SCALEFACTOR = {"debug"   : 4,
                        "release" : 1 }
-
-# Use this to run several variants of the tests.
-VARIANT_FLAGS = {
-    "default": [],
-    "stress": ["--stress-opt", "--always-opt"],
-    "turbofan": ["--turbo-asm", "--turbo-filter=*", "--always-opt"],
-    "nocrankshaft": ["--nocrankshaft"]}

 VARIANTS = ["default", "stress", "turbofan", "nocrankshaft"]

=======================================
--- /branches/bleeding_edge/tools/testrunner/local/testsuite.py Wed Nov 5 10:38:40 2014 UTC +++ /branches/bleeding_edge/tools/testrunner/local/testsuite.py Wed Nov 5 13:05:28 2014 UTC
@@ -34,6 +34,17 @@
 from . import utils
 from ..objects import testcase

+# Use this to run several variants of the tests.
+VARIANT_FLAGS = {
+    "default": [],
+    "stress": ["--stress-opt", "--always-opt"],
+    "turbofan": ["--turbo-asm", "--turbo-filter=*", "--always-opt"],
+    "nocrankshaft": ["--nocrankshaft"]}
+
+FAST_VARIANT_FLAGS = [
+    f for v, f in VARIANT_FLAGS.iteritems() if v in ["default", "turbofan"]
+]
+
 class TestSuite(object):

   @staticmethod
@@ -82,7 +93,7 @@
if testcase.outcomes and statusfile.OnlyStandardVariant(testcase.outcomes):
       return [[]]
if testcase.outcomes and statusfile.OnlyFastVariants(testcase.outcomes):
-      return filter(lambda v: v in ["default", "turbofan"], default_flags)
+ return filter(lambda flags: flags in FAST_VARIANT_FLAGS, default_flags)
     return default_flags

   def DownloadData(self):

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to