summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-10 21:55:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-10 21:55:10 +0000
commitc22ef3bd637fb31748d51b397a33b44fe1be5922 (patch)
treed0d7f073e2989e85c70085a67fcd0ff5ef4b84c4
parente6eda1f80e44dfa5ed147468329f48008f048ada (diff)
parent92164903212ddd72362ebb2f310fa86abff606d6 (diff)
downloadcore-c22ef3bd637fb31748d51b397a33b44fe1be5922.tar.gz
Merge "Temporarily disable mte_illegal_setjump" into main
-rw-r--r--debuggerd/Android.bp1
-rw-r--r--debuggerd/debuggerd_test.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 235fdfdde..2529516da 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -373,7 +373,6 @@ cc_test {
sanitize: {
memtag_heap: true,
- memtag_stack: true,
},
shared_libs: [
diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index 3e650c4b8..7c52e6e50 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -610,7 +610,7 @@ __attribute__((noinline)) void mte_illegal_setjmp_helper(jmp_buf& jump_buf) {
setjmp(jump_buf);
}
-TEST_F(CrasherTest, mte_illegal_setjmp) {
+TEST_F(CrasherTest, DISABLED_mte_illegal_setjmp) {
// This setjmp is illegal because it jumps back into a function that already returned.
// Quoting man 3 setjmp:
// If the function which called setjmp() returns before longjmp() is