diff options
author | Florian Mayer <fmayer@google.com> | 2022-04-16 07:04:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-16 07:04:44 +0000 |
commit | 953412c3f637d8a8ab190a3cdd2173131049c84b (patch) | |
tree | 1ee89b12d94899dcee27cffe2af54949a329cdde | |
parent | 26876fff13f0bb06ea7fff61424b4178faf6a76c (diff) | |
parent | d559eb5e67da8e34acb7f052c182344156eff75c (diff) | |
download | bionic-953412c3f637d8a8ab190a3cdd2173131049c84b.tar.gz |
Merge changes from topic "debuggerdhwasan" am: 98619ee611 am: d559eb5e67
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2065733
Change-Id: I5d9c81225597b0546a711bec6bfa602d02de5719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/setjmp_test.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/setjmp_test.cpp b/tests/setjmp_test.cpp index ee126eb11..472aa205b 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, setjmp_stack) { } 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*) {}}; |