ART: Use dex2oat watchdog in host run-test
Increase the timeout time for dex2oat to 90s, but let the internal
watchdog trigger after the original 60s.
Bug: 62337922
Test: art/test/testrunner/testrunner.py -b --host
Change-Id: I4ef72c62be56b4de2d872cb387660ac1d8244e1a
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index ca52a99..7677025 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -610,7 +610,7 @@
if [ "$HOST" != "n" ]; then
# Use SIGRTMIN+2 to try to dump threads.
# Use -k 1m to SIGKILL it a minute later if it hasn't ended.
- dex2oat_cmdline="timeout -k 1m -s SIGRTMIN+2 1m ${dex2oat_cmdline}"
+ dex2oat_cmdline="timeout -k 1m -s SIGRTMIN+2 90s ${dex2oat_cmdline} --watchdog-timeout=60000"
fi
if [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then
vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"