diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-01 20:48:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-01 20:48:07 +0000 |
| commit | 99ebeb82c67743bff3d127e41dad917ee96705e9 (patch) | |
| tree | 4af802a24ae97d7073e8b88c76c6fc712305ef69 | |
| parent | 8db32c19ad1c69fa9969a300df8351f3264368e2 (diff) | |
| parent | 5d0345280acac03d03b1b4072de56a1ffff19c52 (diff) | |
| download | bionic-99ebeb82c67743bff3d127e41dad917ee96705e9.tar.gz | |
Merge "Extend bionic-unit-tests timeout." into android13-tests-dev am: 9c1e170668 am: 5d0345280a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2417212
Change-Id: I3ff5e769d5abec3042a267e9e5ed0fcf83947305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/gwp_asan_test.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp index b2c7780b1..23fb8b9b6 100644 --- a/tests/gwp_asan_test.cpp +++ b/tests/gwp_asan_test.cpp @@ -50,6 +50,15 @@ void RunGwpAsanTest(const char* test_name) { R"(\[ PASSED \] [1-9]+0? test)"); } +// GWP-ASan tests can run much slower, especially when combined with HWASan. +// Triple the deadline to avoid flakes (b/238585984). +extern "C" bool GetInitialArgs(const char*** args, size_t* num_args) { + static const char* initial_args[] = {"--deadline_threshold_ms=270000"}; + *args = initial_args; + *num_args = 1; + return true; +} + // This file implements "torture testing" under GWP-ASan, where we sample every // single allocation. The upper limit for the number of GWP-ASan allocations in // the torture mode is is generally 40,000, so that svelte devices don't |