Revert "ART: Detect target run-test timeout and print a message"
This reverts commit 2704d0ac013e46cb237a1a13e607fa644fde4c03.
Reason for revert: The CL swallows the exit code, which breaks tests.
Bug: 140935398
Change-Id: Ica4e8461b5465063e8c726285c5fed8e4ee6d93b
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 8315541..7a75cfd 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -1093,7 +1093,6 @@
fi
timeout_prefix=
- timeout_suffix=
if [ "$TIME_OUT" = "timeout" ]; then
# Add timeout command if time out is desired.
#
@@ -1102,10 +1101,7 @@
# dumping do not lead to a deadlock, we also use the "-k" option to definitely kill the
# child.
# Note: Using "--foreground" to not propagate the signal to children, i.e., the runtime.
- timeout_prefix="timeout --foreground -k 120s ${TIME_OUT_VALUE}s ${timeout_dumper_cmd}"
- # Use a suffix to detect timeout and echo something. Otherwise there's no immediate
- # visible feedback (outside of logcat).
- timeout_suffix=' || if [ $? -eq 124 ] ; then echo "TIMED OUT!" ; false ; fi'
+ timeout_prefix="timeout --foreground -k 120s ${TIME_OUT_VALUE}s ${timeout_dumper_cmd} $cmdline"
fi
# Create a script with the command. The command can get longer than the longest
@@ -1132,7 +1128,7 @@
$vdex_cmdline && \
$strip_cmdline && \
$sync_cmdline && \
- $timeout_prefix $dalvikvm_cmdline $timeout_suffix"
+ $timeout_prefix $dalvikvm_cmdline"
cmdfile=$(tempfile -p "cmd-" -s "-$TEST_NAME")
echo "$cmdline" > $cmdfile