Reviewers: Jakob,
Message:
PTAL.
Description:
Changed test expectations for ARM and MIPS.
Please review this at http://codereview.chromium.org/7778042/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M test/cctest/cctest.status
M test/mjsunit/mjsunit.status
M tools/test.py
Index: test/cctest/cctest.status
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index
78f3756195d97a6279f4725c4f2e9f1300065c9d..5122da5ae3d927c75d36adf1aeab834e3444eca8
100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -76,3 +76,7 @@ test-debug/DebugBreakLoop: SKIP
[ $arch == mips ]
test-deoptimization: SKIP
test-serialize: SKIP
+
+# Tests that may time out.
+test-api/ExternalArrays: PASS || TIMEOUT
+test-api/Threading: PASS || TIMEOUT
Index: test/mjsunit/mjsunit.status
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index
b7b0c774c419e9823cd24965632140d8ee295ea7..3aa1c26bc79959789915fc2143ff1b722345779a
100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -115,6 +115,9 @@ regress/regress-1132: SKIP
##############################################################################
[ $arch == mips ]
+# Run those tests, but expect them to time out.
+array-sort: PASS || TIMEOUT
+mirror-object: PASS || TIMEOUT
# Skip long-running tests.
compiler/alloc-number: SKIP
@@ -141,8 +144,11 @@ regress/regress-634: SKIP
regress/regress-create-exception: SKIP
regress/regress-3218915: SKIP
regress/regress-3247124: SKIP
+regress/regress-1132: PASS || TIMEOUT
+regress/regress-1257: PASS || TIMEOUT
+regress/regress-91008: PASS || TIMEOUT
-
+##############################################################################
[ $isolates ]
# d8-os writes temporary files that might interfer with each other when
running
# in multible threads. Skip this if running with isolates testing.
Index: tools/test.py
diff --git a/tools/test.py b/tools/test.py
index
d40159c6f2c67aaa91518fc952383e4324d2b7d1..5d143fe621fb25b6f6409803656637503cd65d8b
100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1164,6 +1164,7 @@ def ReadConfigurationInto(path, sections, defs):
ARCH_GUESS = utils.GuessArchitecture()
+TIMEOUT_DEFAULT = 60;
def BuildOptions():
@@ -1188,7 +1189,7 @@ def BuildOptions():
result.add_option("-s", "--suite", help="A test suite",
default=[], action="append")
result.add_option("-t", "--timeout", help="Timeout in seconds",
- default=60, type="int")
+ default=-1, type="int")
result.add_option("--arch", help='The architecture to run tests for',
default='none')
result.add_option("--snapshot", help="Run the tests with snapshot turned
on",
@@ -1256,12 +1257,17 @@ def ProcessOptions(options):
return False
# Ensure that the simulator argument is handed down to scons.
options.scons_flags.append("simulator=" + options.simulator)
+ # Simulators are slow, therefore allow a longer default timeout.
+ if options.timeout == -1:
+ options.timeout = 2 * TIMEOUT_DEFAULT;
else:
# If options.arch is not set by the command line and no simulator
setting
# was found, set the arch to the guess.
if options.arch == 'none':
options.arch = ARCH_GUESS
options.scons_flags.append("arch=" + options.arch)
+ if options.timeout == -1:
+ options.timeout = TIMEOUT_DEFAULT;
if options.snapshot:
options.scons_flags.append("snapshot=on")
global VARIANT_FLAGS
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
