commit 12c86dabf9c7fcee17fcecc7046572ccf395451d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 06 21:44:45 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 06 21:44:45 2023 +0000
tree d3044f2363351f4ee57113cca32364b05db03fcd
parent b49314108df619faf17f2a4706518c934e4b77d0
parent d957e96b58b734d0fc78071803bae95cd4df84cd

Merge "Extend MemtagNoteTest." into main

libc/include/pthread.h

diff --git a/libc/include/pthread.h b/libc/include/pthread.h
index 4feade5..9d99aa1 100644
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -77,12 +77,12 @@
 
 #if defined(__LP64__)
 #if defined(PAGE_SIZE)
-#define PTHREAD_STACK_MIN (4 * PAGE_SIZE)
+#define PTHREAD_STACK_MIN 16384
 #else
 #define PTHREAD_STACK_MIN 65536
 #endif
 #else
-#define PTHREAD_STACK_MIN (2 * PAGE_SIZE)
+#define PTHREAD_STACK_MIN 8192
 #endif
 
 #define PTHREAD_CREATE_DETACHED 1

tests/memtag_globals_test.cpp

diff --git a/tests/memtag_globals_test.cpp b/tests/memtag_globals_test.cpp
index 4482c8a..3736d4c 100644
--- a/tests/memtag_globals_test.cpp
+++ b/tests/memtag_globals_test.cpp
@@ -34,13 +34,11 @@
 #include "utils.h"
 #endif
 
-#include <android-base/test_utils.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string>
 
 TEST(MemtagGlobalsTest, test) {
-    SKIP_WITH_HWASAN << "b/313613493";
 #if defined(__BIONIC__) && defined(__aarch64__)
   std::string binary = GetPrebuiltElfDir() + "/memtag_globals_binary.so";
   chmod(binary.c_str(), 0755);