diff options
| author | Andreas Gampe <agampe@google.com> | 2018-12-14 10:48:53 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2018-12-18 15:02:41 -0800 |
| commit | 4bdcf5dd5f65e2e3d40ecc35ede1450dd9c86a6f (patch) | |
| tree | b59439c9bef57ce5066f768a057fb06a08dac051 /build | |
| parent | d406b621c41330593ad69bad4eb9517116da284e (diff) | |
| download | art-4bdcf5dd5f65e2e3d40ecc35ede1450dd9c86a6f.tar.gz art-4bdcf5dd5f65e2e3d40ecc35ede1450dd9c86a6f.tar.bz2 art-4bdcf5dd5f65e2e3d40ecc35ede1450dd9c86a6f.zip | |
ART: Use timeout --foreground
Do not propagate the timeout signal to the runtime.
Test: manual
Change-Id: I51ebaa383f240828f0c9a3cf2255b235dd09ed9b
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.gtest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 1bcca7c5dc..a926d9a686 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -525,7 +525,7 @@ $$(gtest_output): NAME := $$(gtest_rule) ifeq (,$(SANITIZE_HOST)) $$(gtest_output): $$(gtest_exe) $$(gtest_deps) $(hide) ($$(call ART_TEST_SKIP,$$(NAME)) && \ - timeout -k 120s -s SIGRTMIN+2 2400s $(HOST_OUT_EXECUTABLES)/timeout_dumper \ + timeout --foreground -k 120s -s SIGRTMIN+2 2400s $(HOST_OUT_EXECUTABLES)/timeout_dumper \ $$< --gtest_output=xml:$$@ && \ $$(call ART_TEST_PASSED,$$(NAME))) || $$(call ART_TEST_FAILED,$$(NAME)) else @@ -538,7 +538,7 @@ else # under ASAN. $$(gtest_output): $$(gtest_exe) $$(gtest_deps) $(hide) ($$(call ART_TEST_SKIP,$$(NAME)) && set -o pipefail && \ - ASAN_OPTIONS=detect_leaks=1 timeout -k 120s -s SIGRTMIN+2 3600s \ + ASAN_OPTIONS=detect_leaks=1 timeout --foreground -k 120s -s SIGRTMIN+2 3600s \ $(HOST_OUT_EXECUTABLES)/timeout_dumper \ $$< --gtest_output=xml:$$@ 2>&1 | tee $$<.tmp.out >&2 && \ { $$(call ART_TEST_PASSED,$$(NAME)) ; rm $$<.tmp.out ; }) || \ |