Reviewers: Rico,
Description:
Let test configuration disable variant flags. Used for preparser tests.
Fixes problem with nosse[234] tests (or anything else that would pass an
unexpected extra parameter on the preparser test command line).
Please review this at http://codereview.chromium.org/6965008/
Affected files:
M test/preparser/testcfg.py
M tools/test.py
Index: test/preparser/testcfg.py
diff --git a/test/preparser/testcfg.py b/test/preparser/testcfg.py
index
c78d03bc470bcc5552acc9603e23ff7610492bfa..027678c470c51eaccf881c80d8a53b061d13e5d5
100644
--- a/test/preparser/testcfg.py
+++ b/test/preparser/testcfg.py
@@ -85,6 +85,9 @@ class PreparserTestConfiguration(test.TestConfiguration):
if exists(status_file):
test.ReadConfigurationInto(status_file, sections, defs)
+ def VariantFlags(self):
+ return [[]];
+
def GetConfiguration(context, root):
return PreparserTestConfiguration(context, root)
Index: tools/test.py
diff --git a/tools/test.py b/tools/test.py
index
c1840bb428803f36ee3727da4b325d0bb487c5bc..cb2428cab852892c1eaa0e89106e1032e76fc723
100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -392,7 +392,7 @@ class TestCase(object):
result = self.RunCommand(self.GetCommand())
except:
self.terminate = True
- raise BreakNowException("Used pressed CTRL+C or IO went wrong")
+ raise BreakNowException("User pressed CTRL+C or IO went wrong")
finally:
self.AfterRun(result)
return result
@@ -566,6 +566,13 @@ def CarCdr(path):
return (path[0], path[1:])
+# Use this to run several variants of the tests, e.g.:
+# VARIANT_FLAGS = [[], ['--always_compact', '--noflush_code']]
+VARIANT_FLAGS = [[],
+ ['--stress-opt', '--always-opt'],
+ ['--nocrankshaft']]
+
+
class TestConfiguration(object):
def __init__(self, context, root):
@@ -583,6 +590,11 @@ class TestConfiguration(object):
def GetTestStatus(self, sections, defs):
pass
+ def VariantFlags(self):
+ return VARIANT_FLAGS
+
+
+
class TestSuite(object):
@@ -593,13 +605,6 @@ class TestSuite(object):
return self.name
-# Use this to run several variants of the tests, e.g.:
-# VARIANT_FLAGS = [[], ['--always_compact', '--noflush_code']]
-VARIANT_FLAGS = [[],
- ['--stress-opt', '--always-opt'],
- ['--nocrankshaft']]
-
-
class TestRepository(TestSuite):
def __init__(self, path):
@@ -627,12 +632,11 @@ class TestRepository(TestSuite):
return self.GetConfiguration(context).GetBuildRequirements()
def AddTestsToList(self, result, current_path, path, context, mode):
- for v in VARIANT_FLAGS:
+ for v in self.GetConfiguration(context).VariantFlags():
tests = self.GetConfiguration(context).ListTests(current_path, path,
mode, v)
for t in tests: t.variant_flags = v
result += tests
-
def GetTestStatus(self, context, sections, defs):
self.GetConfiguration(context).GetTestStatus(sections, defs)
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
