X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-memchr2.c;h=a992fb5c08ab3f5c7fd47db9179c022bfbf88f6f;hb=cc0cf3448ee24a769fd11c5015ce4b27675d4375;hp=68e85952219d15537c10bda2927bcec285f055c2;hpb=f91b9f973226f2b434ba24e32845f252a3d6e64b;p=gnulib.git

diff --git a/tests/test-memchr2.c b/tests/test-memchr2.c
index 68e859522..a992fb5c0 100644
--- a/tests/test-memchr2.c
+++ b/tests/test-memchr2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008-2009 Free Software Foundation
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,23 +19,18 @@
 
 #include "memchr2.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-	{								     \
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-	  abort ();							     \
-	}								     \
-    }									     \
-  while (0)
+#include "zerosize-ptr.h"
+#include "macros.h"
+
+/* Calculating void * + int is not portable, so this wrapper converts
+   to char * to make the tests easier to write.  */
+#define MEMCHR2 (char *) memchr2
 
 int
-main ()
+main (void)
 {
   size_t n = 0x100000;
   char *input = malloc (n);
@@ -48,27 +43,28 @@ main ()
   input[n - 2] = 'e';
   input[n - 1] = 'a';
 
-  ASSERT (memchr2 (input, 'a', 'b', n) == input);
-  ASSERT (memchr2 (input, 'b', 'a', n) == input);
+  /* Basic behavior tests.  */
+  ASSERT (MEMCHR2 (input, 'a', 'b', n) == input);
+  ASSERT (MEMCHR2 (input, 'b', 'a', n) == input);
 
-  ASSERT (memchr2 (input, 'a', 'b', 0) == NULL);
-  ASSERT (memchr2 (NULL, 'a', 'b', 0) == NULL);
+  ASSERT (MEMCHR2 (input, 'a', 'b', 0) == NULL);
+  ASSERT (MEMCHR2 (zerosize_ptr (), 'a', 'b', 0) == NULL);
 
-  ASSERT (memchr2 (input, 'b', 'd', n) == input + 1);
-  ASSERT (memchr2 (input + 2, 'b', 'd', n - 2) == input + 1026);
+  ASSERT (MEMCHR2 (input, 'b', 'd', n) == input + 1);
+  ASSERT (MEMCHR2 (input + 2, 'b', 'd', n - 2) == input + 1026);
 
-  ASSERT (memchr2 (input, 'd', 'e', n) == input + 1026);
-  ASSERT (memchr2 (input, 'e', 'd', n) == input + 1026);
+  ASSERT (MEMCHR2 (input, 'd', 'e', n) == input + 1026);
+  ASSERT (MEMCHR2 (input, 'e', 'd', n) == input + 1026);
 
-  ASSERT (memchr2 (input + 1, 'a', 'e', n - 1) == input + n - 2);
-  ASSERT (memchr2 (input + 1, 'e', 'a', n - 1) == input + n - 2);
+  ASSERT (MEMCHR2 (input + 1, 'a', 'e', n - 1) == input + n - 2);
+  ASSERT (MEMCHR2 (input + 1, 'e', 'a', n - 1) == input + n - 2);
 
-  ASSERT (memchr2 (input, 'f', 'g', n) == NULL);
-  ASSERT (memchr2 (input, 'f', '\0', n) == NULL);
+  ASSERT (MEMCHR2 (input, 'f', 'g', n) == NULL);
+  ASSERT (MEMCHR2 (input, 'f', '\0', n) == NULL);
 
-  ASSERT (memchr2 (input, 'a', 'a', n) == input);
-  ASSERT (memchr2 (input + 1, 'a', 'a', n - 1) == input + n - 1);
-  ASSERT (memchr2 (input, 'f', 'f', n) == NULL);
+  ASSERT (MEMCHR2 (input, 'a', 'a', n) == input);
+  ASSERT (MEMCHR2 (input + 1, 'a', 'a', n - 1) == input + n - 1);
+  ASSERT (MEMCHR2 (input, 'f', 'f', n) == NULL);
 
   /* Check that a very long haystack is handled quickly if one of the
      two bytes is found near the beginning.  */
@@ -76,10 +72,25 @@ main ()
     size_t repeat = 10000;
     for (; repeat > 0; repeat--)
       {
-	ASSERT (memchr2 (input, 'c', 'e', n) == input + 2);
-	ASSERT (memchr2 (input, 'e', 'c', n) == input + 2);
-	ASSERT (memchr2 (input, 'c', '\0', n) == input + 2);
-	ASSERT (memchr2 (input, '\0', 'c', n) == input + 2);
+        ASSERT (MEMCHR2 (input, 'c', 'e', n) == input + 2);
+        ASSERT (MEMCHR2 (input, 'e', 'c', n) == input + 2);
+        ASSERT (MEMCHR2 (input, 'c', '\0', n) == input + 2);
+        ASSERT (MEMCHR2 (input, '\0', 'c', n) == input + 2);
+      }
+  }
+
+  /* Alignment tests.  */
+  {
+    int i, j;
+    for (i = 0; i < 32; i++)
+      {
+        for (j = 0; j < 256; j++)
+          input[i + j] = j;
+        for (j = 0; j < 256; j++)
+          {
+            ASSERT (MEMCHR2 (input + i, j, 0xff, 256) == input + i + j);
+            ASSERT (MEMCHR2 (input + i, 0xff, j, 256) == input + i + j);
+          }
       }
   }