|
From: <sv...@va...> - 2016-02-26 16:05:40
|
Author: petarj
Date: Fri Feb 26 16:05:29 2016
New Revision: 15815
Log:
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.
Modified:
trunk/memcheck/tests/memalign_test.c
trunk/tests/sys_mman.h
Modified: trunk/memcheck/tests/memalign_test.c
==============================================================================
--- trunk/memcheck/tests/memalign_test.c (original)
+++ trunk/memcheck/tests/memalign_test.c Fri Feb 26 16:05:29 2016
@@ -10,7 +10,8 @@
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));
Modified: trunk/tests/sys_mman.h
==============================================================================
--- trunk/tests/sys_mman.h (original)
+++ trunk/tests/sys_mman.h Fri Feb 26 16:05:29 2016
@@ -21,7 +21,8 @@
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);
|