test-rawmemchr: make more robust

* modules/rawmemchr-tests (Files): Add zerosize-ptr.h, mmap-anon.m4.
(Depends-on, configure.ac): Add needed prerequisites to use it.
* modules/memchr-tests (Files, Depends-on, configure.ac):
Likewise, to avoid implicit reliance on memchr module prereqs.
* tests/test-memchr.c (main): Ensure proper masking.
* tests/test-rawmemchr.c (main): Likewise.  Detect oversized
reads.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index f4bdc7f9352b71f12edfcd780b23563d8f54b7aa..4b259dac15da01dd08881b993be135e4d3f9e814 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-14  Eric Blake  <eblake@redhat.com>
 
+       test-rawmemchr: make more robust
+       * modules/rawmemchr-tests (Files): Add zerosize-ptr.h, mmap-anon.m4.
+       (Depends-on, configure.ac): Add needed prerequisites to use it.
+       * modules/memchr-tests (Files, Depends-on, configure.ac):
+       Likewise, to avoid implicit reliance on memchr module prereqs.
+       * tests/test-memchr.c (main): Ensure proper masking.
+       * tests/test-rawmemchr.c (main): Likewise.  Detect oversized
+       reads.
+
        memchr: detect glibc Alpha bug
        Avoids http://sourceware.org/bugzilla/show_bug.cgi?id=12019.
        * m4/memchr.m4 (gl_FUNC_MEMCHR): Detect glibc 2.11.2 failure on

diff --git a/modules/memchr-tests b/modules/memchr-tests
index 4fafa8dcc600ccc21f920f53dc3fe18da0b6073a..3022471fe6c2187a2868d9225e8114bdb110c67b 100644 (file)
--- a/modules/memchr-tests
+++ b/modules/memchr-tests
@@ -3,10 +3,17 @@ tests/test-memchr.c
 tests/zerosize-ptr.h
 tests/signature.h
 tests/macros.h
+m4/mmap-anon.m4
 
 Depends-on:
+extensions
+getpagesize
 
 configure.ac:
+dnl Check for prerequisites for memory fence checks.
+gl_FUNC_MMAP_ANON
+AC_CHECK_HEADERS_ONCE([sys/mman.h])
+AC_CHECK_FUNCS_ONCE([mprotect])
 
 Makefile.am:
 TESTS += test-memchr

diff --git a/modules/rawmemchr-tests b/modules/rawmemchr-tests
index bca145e1acdc92a8c7295c46b927cf070cb5fb25..f2d4c622c8fe800b66a9017cfb680c107866bcbd 100644 (file)
--- a/modules/rawmemchr-tests
+++ b/modules/rawmemchr-tests
@@ -1,11 +1,19 @@
 Files:
 tests/test-rawmemchr.c
+tests/zerosize-ptr.h
 tests/signature.h
 tests/macros.h
+m4/mmap-anon.m4
 
 Depends-on:
+extensions
+getpagesize
 
 configure.ac:
+dnl Check for prerequisites for memory fence checks.
+gl_FUNC_MMAP_ANON
+AC_CHECK_HEADERS_ONCE([sys/mman.h])
+AC_CHECK_FUNCS_ONCE([mprotect])
 
 Makefile.am:
 TESTS += test-rawmemchr

diff --git a/tests/test-memchr.c b/tests/test-memchr.c
index e7b9780d968a73f59e86422ccc21a1308b121894..05e1bfaed2b65dc03a498b0b66faaa746f909816 100644 (file)
--- a/tests/test-memchr.c
+++ b/tests/test-memchr.c
@@ -57,6 +57,7 @@ main (void)
 
   ASSERT (MEMCHR (input + 1, 'a', n - 1) == input + n - 1);
   ASSERT (MEMCHR (input + 1, 'e', n - 1) == input + n - 2);
+  ASSERT (MEMCHR (input + 1, 0x789abc00 | 'e', n - 1) == input + n - 2);
 
   ASSERT (MEMCHR (input, 'f', n) == NULL);
   ASSERT (MEMCHR (input, '\0', n) == NULL);

diff --git a/tests/test-rawmemchr.c b/tests/test-rawmemchr.c
index 94768183e00d8c26e3c01a761b78de5622f4c593..804e15780a8885878e8f929f37a8f01346de729c 100644 (file)
--- a/tests/test-rawmemchr.c
+++ b/tests/test-rawmemchr.c
@@ -24,6 +24,7 @@ SIGNATURE_CHECK (rawmemchr, void *, (void const *, int));
 
 #include <stdlib.h>
 
+#include "zerosize-ptr.h"
 #include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
@@ -53,6 +54,7 @@ main (void)
 
   ASSERT (RAWMEMCHR (input + 1, 'a') == input + n - 1);
   ASSERT (RAWMEMCHR (input + 1, 'e') == input + n - 2);
+  ASSERT (RAWMEMCHR (input + 1, 0x789abc00 | 'e') == input + n - 2);
 
   ASSERT (RAWMEMCHR (input, '\0') == input + n);
 
@@ -70,6 +72,20 @@ main (void)
       }
   }
 
+  /* Ensure that no unaligned oversized reads occur.  */
+  {
+    char *page_boundary = (char *) zerosize_ptr ();
+    size_t i;
+
+    if (!page_boundary)
+      page_boundary = input + 4096;
+    memset (page_boundary - 512, '1', 511);
+    page_boundary[-1] = '2';
+    for (i = 1; i <= 512; i++)
+      ASSERT (RAWMEMCHR (page_boundary - i, (i * 0x01010100) | '2')
+              == page_boundary - 1);
+  }
+
   free (input);
 
   return 0;