Merge changes from topic "debuggerdhwasan" am: 98619ee611 am: d559eb5e67 am: 953412c3f6 am: 0d0b044170
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2065733
Change-Id: If25285c8a448b18b9aa48ca7423643da4ba87347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/setjmp_test.cpp b/tests/setjmp_test.cpp
index ee126eb..472aa20 100644
--- a/tests/setjmp_test.cpp
+++ b/tests/setjmp_test.cpp
@@ -22,6 +22,7 @@
#include <unistd.h>
#include <android-base/silent_death_test.h>
+#include <android-base/test_utils.h>
#include "SignalUtils.h"
@@ -273,6 +274,7 @@
}
TEST(setjmp, bug_152210274) {
+ SKIP_WITH_HWASAN; // b/227390656
// Ensure that we never have a mangled value in the stack pointer.
#if defined(__BIONIC__)
struct sigaction sa = {.sa_flags = SA_SIGINFO, .sa_sigaction = [](int, siginfo_t*, void*) {}};