Merge "Increase test 961 dex2oat timeout to 2 minutes"
diff --git a/test/961-default-iface-resolution-gen/run b/test/961-default-iface-resolution-gen/run
new file mode 100755
index 0000000..fdcd2a8
--- /dev/null
+++ b/test/961-default-iface-resolution-gen/run
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Run with a 2 minute default dex2oat timeout and a 2.5 minute hard dex2oat timeout.
+./default-run "$@" --dex2oat-timeout 120 --dex2oat-rt-timeout 180
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index c16c487..d37e6bc 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -70,6 +70,10 @@
VDEX_FILTER=""
PROFILE="n"
RANDOM_PROFILE="n"
+# The normal dex2oat timeout.
+DEX2OAT_TIMEOUT="60"
+# The *hard* timeout where we really start trying to kill the dex2oat.
+DEX2OAT_RT_TIMEOUT="90"
# if "y", set -Xstacktracedir and inform the test of its location. When
# this is set, stack trace dumps (from signal 3) will be written to a file
@@ -87,6 +91,22 @@
if [ "x$1" = "x--quiet" ]; then
QUIET="y"
shift
+ elif [ "x$1" = "x--dex2oat-rt-timeout" ]; then
+ shift
+ if [ "x$1" = "x" ]; then
+ echo "$0 missing argument to --dex2oat-rt-timeout" 1>&2
+ exit 1
+ fi
+ DEX2OAT_RT_TIMEOUT="$1"
+ shift
+ elif [ "x$1" = "x--dex2oat-timeout" ]; then
+ shift
+ if [ "x$1" = "x" ]; then
+ echo "$0 missing argument to --dex2oat-timeout" 1>&2
+ exit 1
+ fi
+ DEX2OAT_TIMEOUT="$1"
+ shift
elif [ "x$1" = "x--jvmti" ]; then
IS_JVMTI_TEST="y"
shift
@@ -646,10 +666,11 @@
# Note: as we don't know how decent targets are (e.g., emulator), only do this on the host for
# now. We should try to improve this.
# The current value is rather arbitrary. run-tests should compile quickly.
+ # Watchdog timeout is in milliseconds so add 3 '0's to the dex2oat timeout.
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 90s ${dex2oat_cmdline} --watchdog-timeout=60000"
+ dex2oat_cmdline="timeout -k ${DEX2OAT_TIMEOUT}s -s SIGRTMIN+2 ${DEX2OAT_RT_TIMEOUT}s ${dex2oat_cmdline} --watchdog-timeout=${DEX2OAT_TIMEOUT}000"
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"