Merge "16k: Fix pthread tests to support 4k/16k page sizes" into main am: 837e4d1f52
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2863353
Change-Id: I8d689ab3f0a3a8b846ec303c2b6b8859fb7acf96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 73090e1..749d687 100644
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <sys/cdefs.h>
#include <sys/mman.h>
+#include <sys/param.h>
#include <sys/prctl.h>
#include <sys/resource.h>
#include <sys/syscall.h>
@@ -784,7 +785,7 @@
size_t guard_size;
ASSERT_EQ(0, pthread_attr_getguardsize(&attributes, &guard_size));
ASSERT_EQ(128U, guard_size);
- ASSERT_EQ(4096U, GetActualGuardSize(attributes));
+ ASSERT_EQ(static_cast<unsigned long>(getpagesize()), GetActualGuardSize(attributes));
}
TEST(pthread, pthread_attr_setguardsize_reasonable) {
@@ -808,7 +809,7 @@
size_t guard_size;
ASSERT_EQ(0, pthread_attr_getguardsize(&attributes, &guard_size));
ASSERT_EQ(32*1024U + 1, guard_size);
- ASSERT_EQ(36*1024U, GetActualGuardSize(attributes));
+ ASSERT_EQ(roundup(32 * 1024U + 1, getpagesize()), GetActualGuardSize(attributes));
}
TEST(pthread, pthread_attr_setguardsize_enormous) {