run-test: ThreadSuspendTimeout only applies to ART.

Test: art/test/run-test --jvm works
Test: art/test/run-test --host works
Change-Id: I58f10b6c7b19df0827e108d2da89d873582bafbe

diff --git a/test/run-test b/test/run-test
index c78fa35..a228789 100755 (executable)
--- a/test/run-test
+++ b/test/run-test
@@ -408,7 +408,9 @@ tmp_dir="`cd $oldwd ; python -c "import os; print os.path.realpath('$tmp_dir')"`
 mkdir -p $tmp_dir
 
 # Add thread suspend timeout flag
-run_args="${run_args} --runtime-option -XX:ThreadSuspendTimeout=$suspend_timeout"
+if [ ! "$runtime" = "jvm" ]; then
+  run_args="${run_args} --runtime-option -XX:ThreadSuspendTimeout=$suspend_timeout"
+fi
 
 if [ "$basic_verify" = "true" ]; then
   # Set HspaceCompactForOOMMinIntervalMs to zero to run hspace compaction for OOM more frequently in tests.