X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-memcmp.c;h=479017940971ff3dab0cc8bc41d65e781af048d9;hb=60573660307a386a933de834a06c37691120e507;hp=28c8fb00b98d69eb881726ed948d4fe232dd5450;hpb=f57b1e96a2f83183073b34a05890aa4875708301;p=gnulib.git

diff --git a/tests/test-memcmp.c b/tests/test-memcmp.c
index 28c8fb00b..479017940 100644
--- a/tests/test-memcmp.c
+++ b/tests/test-memcmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008-2011 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,34 +19,53 @@
 
 #include <string.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-	{								     \
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-	  fflush (stderr);						     \
-	  abort ();							     \
-	}								     \
-    }									     \
-  while (0)
+#include "signature.h"
+SIGNATURE_CHECK (memcmp, int, (void const *, void const *, size_t));
+
+#include "zerosize-ptr.h"
+#include "macros.h"
 
 int
 main (void)
 {
-  char foo[] = "foo";
-  char foobar[] = "foobar";
-  char bar[] = "bar";
-
-  ASSERT (memcmp (NULL, NULL, 0) == 0);
-  ASSERT (memcmp (foo, foobar, 2) == 0);
-  ASSERT (memcmp (foo, foobar, 3) == 0);
-  ASSERT (memcmp (foo, foobar, 4) != 0);
-  ASSERT (memcmp (foo, bar, 1) != 0);
-  ASSERT (memcmp (foo, bar, 3) != 0);
+  /* Test equal / not equal distinction.  */
+  ASSERT (memcmp (zerosize_ptr (), zerosize_ptr (), 0) == 0);
+  ASSERT (memcmp ("foo", "foobar", 2) == 0);
+  ASSERT (memcmp ("foo", "foobar", 3) == 0);
+  ASSERT (memcmp ("foo", "foobar", 4) != 0);
+  ASSERT (memcmp ("foo", "bar", 1) != 0);
+  ASSERT (memcmp ("foo", "bar", 3) != 0);
+
+  /* Test less / equal / greater distinction.  */
+  ASSERT (memcmp ("foo", "moo", 4) < 0);
+  ASSERT (memcmp ("moo", "foo", 4) > 0);
+  ASSERT (memcmp ("oomph", "oops", 3) < 0);
+  ASSERT (memcmp ("oops", "oomph", 3) > 0);
+  ASSERT (memcmp ("foo", "foobar", 4) < 0);
+  ASSERT (memcmp ("foobar", "foo", 4) > 0);
+
+  /* Some old versions of memcmp were not 8-bit clean.  */
+  ASSERT (memcmp ("\100", "\201", 1) < 0);
+  ASSERT (memcmp ("\201", "\100", 1) > 0);
+  ASSERT (memcmp ("\200", "\201", 1) < 0);
+  ASSERT (memcmp ("\201", "\200", 1) > 0);
+
+  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+     or more and with at least one buffer not starting on a 4-byte boundary.
+     William Lewis provided this test program.   */
+  {
+    char foo[21];
+    char bar[21];
+    int i;
+    for (i = 0; i < 4; i++)
+      {
+        char *a = foo + i;
+        char *b = bar + i;
+        strcpy (a, "--------01111111");
+        strcpy (b, "--------10000000");
+        ASSERT (memcmp (a, b, 16) < 0);
+      }
+  }
 
   return 0;
 }