X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-filevercmp.c;h=3572d76dfb687b3a2f0d6c3e1d11c89c2674187f;hb=60573660307a386a933de834a06c37691120e507;hp=4efd108eb12f6bb595cb7e087b174103af9762ad;hpb=9121662f1a3ac82621aac4e7f8e8f64722b0903b;p=gnulib.git

diff --git a/tests/test-filevercmp.c b/tests/test-filevercmp.c
index 4efd108eb..3572d76df 100644
--- a/tests/test-filevercmp.c
+++ b/tests/test-filevercmp.c
@@ -1,5 +1,5 @@
 /* Test of filevercmp() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,26 +19,46 @@
 
 #include "filevercmp.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 /* set of well sorted examples */
 static const char *const examples[] =
 {
+  "",
+  ".",
+  "..",
+  ".0",
+  ".9",
+  ".A",
+  ".Z",
+  ".a~",
+  ".a",
+  ".b~",
+  ".b",
+  ".z",
+  ".zz~",
+  ".zz",
+  ".zz.~1~",
+  ".zz.0",
+  "0",
+  "9",
+  "A",
+  "Z",
+  "a~",
+  "a",
+  "a.b~",
+  "a.b",
+  "a.bc~",
+  "a.bc",
+  "b~",
+  "b",
   "gcc-c++-10.fc9.tar.gz",
+  "gcc-c++-10.fc9.tar.gz.~1~",
+  "gcc-c++-10.fc9.tar.gz.~2~",
   "gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2",
+  "gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2.~1~",
   "glibc-2-0.1.beta1.fc10.rpm",
   "glibc-common-5-0.2.beta2.fc9.ebuild",
   "glibc-common-5-0.2b.deb",
@@ -56,11 +76,17 @@ static const char *const examples[] =
   "nss_ldap-1.0-0.1a.tar.gz",
   "nss_ldap-10beta1.fc8.tar.gz",
   "nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild",
+  "z",
+  "zz~",
+  "zz",
+  "zz.~1~",
+  "zz.0",
+  "#.b#",
   NULL
 };
 
 int
-main (int argc, char **argv)
+main (void)
 {
   const char *const *i;
 
@@ -80,15 +106,15 @@ main (int argc, char **argv)
     {
       const char *const *j;
       for (j = examples; *j; j++)
-	{
-	  int result = filevercmp (*i, *j);
-	  if (result < 0)
-	    ASSERT (i < j);
-	  else if (0 < result)
-	    ASSERT (j < i);
-	  else
-	    ASSERT (i == j);
-	}
+        {
+          int result = filevercmp (*i, *j);
+          if (result < 0)
+            ASSERT (i < j);
+          else if (0 < result)
+            ASSERT (j < i);
+          else
+            ASSERT (i == j);
+        }
     }
 
   return 0;