Merging r242647 and r242651:

------------------------------------------------------------------------
r242647 | eugenis | 2015-07-19 12:57:13 -0700 (Sun, 19 Jul 2015) | 5 lines

[sanitizer] De-flake one test.

signal_segv_handler.cc occasionally fails due to a suspected kernel bug.
Increasing the mapped region size seems to make the test pass reliably.
------------------------------------------------------------------------

------------------------------------------------------------------------
r242651 | dvyukov | 2015-07-19 14:44:49 -0700 (Sun, 19 Jul 2015) | 6 lines

asan: fix a test

Page size is not necessary 4096.
Use sysconf to obtain page size.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_37@242848 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 7 insertions, 3 deletions

diff --git a/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc b/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
index 23e32a884..643fb48ae 100644
--- a/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
+++ b/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
@@ -18,23 +18,27 @@
 #include <signal.h>
 #include <sys/mman.h>
 #include <string.h>
+#include <unistd.h>
 
+unsigned long page_size;
 void *guard;
 
 void handler(int signo, siginfo_t *info, void *uctx) {
-  mprotect(guard, 4096, PROT_READ | PROT_WRITE);
+  mprotect(guard, page_size, PROT_READ | PROT_WRITE);
 }
 
 int main() {
+  page_size = sysconf(_SC_PAGESIZE);
   struct sigaction a, old;
   memset(&a, 0, sizeof(a));
   memset(&old, 0, sizeof(old));
   a.sa_sigaction = handler;
   a.sa_flags = SA_SIGINFO;
   sigaction(SIGSEGV, &a, &old);
-  guard = mmap(0, 4096, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+  guard = mmap(0, 3 * page_size, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
+  guard = (char*)guard + page_size;  // work around a kernel bug 
   for (int i = 0; i < 1000000; i++) {
-    mprotect(guard, 4096, PROT_NONE);
+    mprotect(guard, page_size, PROT_NONE);
     *(int*)guard = 1;
   }
   sigaction(SIGSEGV, &old, 0);