summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2017-01-24 17:40:47 +0000
committer Narayan Kamath <narayan@google.com> 2017-01-24 17:41:43 +0000
commitf86c3939f645703e0ee48de277fb3559dcd1627c (patch)
treeb10d9e511d60bbe1ac7779132cf3346f943e7eee
parentd8981ee26340c46b608fdff2cdf294b2f7d4afce (diff)
run-test: ThreadSuspendTimeout only applies to ART.
Test: art/test/run-test --jvm works Test: art/test/run-test --host works Change-Id: I58f10b6c7b19df0827e108d2da89d873582bafbe
-rwxr-xr-xtest/run-test4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/run-test b/test/run-test
index c78fa35e24..a228789701 100755
--- 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.