Merge "Extend bionic-unit-tests timeout." into android13-tests-dev am: 9c1e170668 am: 5d0345280a am: 99ebeb82c6
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>
diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp
index 8e51323..5f5e3dd 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