summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-31 22:04:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-08-31 22:04:09 -0700
commitce54003aa8961764763c4045991b730974fa9083 (patch)
treeac852cbe7afb0cb0ab825b1863562be8c545364a /tests
parent95434bfaee62161ce02012c6424f0c0c8fffccb5 (diff)
parent38323a5f9f4a53b0118610ac84a47cb9907d4e4b (diff)
downloadframeworks_base-ce54003aa8961764763c4045991b730974fa9083.zip
frameworks_base-ce54003aa8961764763c4045991b730974fa9083.tar.gz
frameworks_base-ce54003aa8961764763c4045991b730974fa9083.tar.bz2
Merge change 23406 into eclair
* changes: allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
Diffstat (limited to 'tests')
-rwxr-xr-xtests/DumpRenderTree/assets/run_layout_tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/assets/run_layout_tests.py b/tests/DumpRenderTree/assets/run_layout_tests.py
index c056de5..c3e6b5b 100755
--- a/tests/DumpRenderTree/assets/run_layout_tests.py
+++ b/tests/DumpRenderTree/assets/run_layout_tests.py
@@ -175,7 +175,7 @@ def main(options, args):
# Count crashed tests.
crashed_tests = []
- timeout_ms = '5000'
+ timeout_ms = '30000'
if options.time_out_ms:
timeout_ms = options.time_out_ms