summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pirama Arumuga Nainar <pirama@google.com> 2024-06-11 05:12:31 +0000
committer VladimĂ­r Marko <vmarko@google.com> 2024-06-11 09:42:58 +0000
commit2ec736ce856f52f2a00790e6d8489ebb7b18238c (patch)
tree595ef2771e6a93ae401136d28b7d4f8afb2a2e73
parent5eb1b03ad0dc05aea13edc61b1208c5d803ad07f (diff)
signal_dumper: Increase timeout under asan
Bug: http://b/322868540 With clang-r522817, signal_dumper takes longer than 120s with asan, causing timeout. Increase the timeout to 180s. Test: TARGET_PRODUCT=armv8 TARGET_RELEASE=trunk_staging \ TARGET_BUILD_VARIANT=eng \ ./prebuilts/build-tools/path/linux-x86/python3 \ ./art/test/testrunner/run_build_test_target.py -j100 art-asan Change-Id: Ib1a601e34e8755ffb31e80a35e55e1b982207420
-rw-r--r--build/Android.gtest.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 434145d39c..32edf16a36 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -273,7 +273,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 --foreground -k 120s 3600s \
+ ASAN_OPTIONS=detect_leaks=1 timeout --foreground -k 180s 3600s \
$(HOST_OUT_EXECUTABLES)/signal_dumper -s 15 \
$$< --gtest_output=xml:$$@ 2>&1 | tee $$<.tmp.out >&2 && \
{ $$(call ART_TEST_PASSED,$$(NAME)) ; rm $$<.tmp.out ; }) || \