Allow 8k and 32k page sizes

Allow 8k and 32k page sizes in memalign and other memory related tests.
This fixes crashes in the tests on systems with 8k or 32k pagesize.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15815

diff --git a/memcheck/tests/memalign_test.c b/memcheck/tests/memalign_test.c
index 38e165d425aaa19b5bc3985a24f631d8f54c6638..e64946280428a9e32abc0de7e8a9af8fa7737001 100644 (file)
--- a/memcheck/tests/memalign_test.c
+++ b/memcheck/tests/memalign_test.c
@@ -10,7 +10,8 @@ int main ( void )
   int i;
   unsigned long pszB = sysconf(_SC_PAGE_SIZE);
   assert(sizeof(long) == sizeof(void*));
-  assert(pszB == 4096 || pszB == 16384 || pszB == 65536);
+  assert(pszB == 4096 || pszB == 8192 || pszB == 16384 || pszB == 32768
+         || pszB == 65536);
 
   for (i = 0; i < 10; i++) {
     a[i] = valloc(11111 * (i+1));

diff --git a/tests/sys_mman.h b/tests/sys_mman.h
index c059308c1259ade7b2184f9766b2c6b16221ec6d..0cdc434f7176216f95276ebb736f6e3314491eaa 100644 (file)
--- a/tests/sys_mman.h
+++ b/tests/sys_mman.h
@@ -21,7 +21,8 @@ static void* get_unmapped_page(void)
    void* ptr;
    int r;
    long pagesz = sysconf(_SC_PAGE_SIZE);
-   assert(pagesz == 4096 || pagesz == 16384 || pagesz == 65536);
+   assert(pagesz == 4096 || pagesz == 8192 || pagesz == 16384 || pagesz == 32768
+          || pagesz == 65536);
    ptr = mmap(0, pagesz, PROT_READ, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
    assert(ptr != (void*)-1);
    r = munmap(ptr, pagesz);