diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-01 21:27:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-01 21:27:53 +0000 |
| commit | bf5644d5887c3061d64e067214568c69ed1cc0ae (patch) | |
| tree | 1ff3736c7ff7a0a1d384207257fe8d16efd49bc0 | |
| parent | 09e956936dce314b9bd052108f2362814d148422 (diff) | |
| parent | 99ebeb82c67743bff3d127e41dad917ee96705e9 (diff) | |
| download | bionic-android13-qpr3-c-s3-release.tar.gz | |
Merge "Extend bionic-unit-tests timeout." into android13-tests-dev am: 9c1e170668 am: 5d0345280a am: 99ebeb82c6android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2417212
Change-Id: I8f3ebd30d1118297691e5849baa822941365928d
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 8e5132304..5f5e3dd17 100644 --- a/tests/gwp_asan_test.cpp +++ b/tests/gwp_asan_test.cpp @@ -43,6 +43,15 @@ // mutation. extern "C" const char* __gnu_basename(const char* path); +// 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 |