commit 93d6ce587003ef83b6e2b1e2889417deb3b7ad5f
author Brian Carlstrom <bdc@google.com> Tue Nov 04 22:31:35 2014 -0800
committer Brian Carlstrom <bdc@google.com> Tue Nov 04 23:19:35 2014 -0800
tree a1f0e754b886877cb7a85d7b7bbeb8a752f1bed0
parent da04f29ab1892c00490f846aba3e435ddd6696cb

Restore run-test TIME_OUT feature

Added in 741c02c4027d374279954ce5542754c098055f24
Lost in 1a58b7f6f14a5ed9355e8e447cae25fb41467f09

Bug: 18248300
Change-Id: Ie5afdaf07d7b994e94decd928c6e0a28e49b4b78

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index af43de3..d2cd8ab 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -36,6 +36,8 @@
 QUIET="n"
 RELOCATE="y"
 SECONDARY_DEX=""
+TIME_OUT="y"
+TIME_OUT_VALUE=5m
 USE_GDB="n"
 USE_JVM="n"
 VERIFY="y"
@@ -99,10 +101,12 @@
         shift
     elif [ "x$1" = "x--debug" ]; then
         DEBUGGER="y"
+        TIME_OUT="n"
         shift
     elif [ "x$1" = "x--gdb" ]; then
         USE_GDB="y"
         DEV_MODE="y"
+        TIME_OUT="n"
         shift
     elif [ "x$1" = "x--zygote" ]; then
         ZYGOTE="-Xzygote"