diff options
| author | Florian Mayer <fmayer@google.com> | 2022-04-16 07:53:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-16 07:53:34 +0000 |
| commit | e88690a91ca7f5e9ec5518e8af4f5fede25cbd95 (patch) | |
| tree | 1ee89b12d94899dcee27cffe2af54949a329cdde | |
| parent | 2ae88c0c669955d5031ad9928383a06b94cc87c7 (diff) | |
| parent | 0d0b0441703b1371876a2afbc870096956305033 (diff) | |
| download | bionic-e88690a91ca7f5e9ec5518e8af4f5fede25cbd95.tar.gz | |
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: I96f5894f0a41149f8f83cd03bdbcb1e27237bf34
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*) {}}; |