X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-filevercmp.c;h=0b348765c8e99dd36c0712e23d272624d78a29c8;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=700e182777338026f5ffb8a6cc0f78ce4db9d0b1;hpb=4fd008794167d43f31b6d2cb565597a14c59d10a;p=gnulib.git

diff --git a/tests/test-filevercmp.c b/tests/test-filevercmp.c
index 700e18277..0b348765c 100644
--- a/tests/test-filevercmp.c
+++ b/tests/test-filevercmp.c
@@ -1,5 +1,5 @@
 /* Test of filevercmp() function.
-   Copyright (C) 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2008-2013 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
@@ -12,27 +12,15 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 #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[] =
@@ -40,10 +28,23 @@ 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~",
@@ -74,12 +75,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;
 
@@ -99,15 +105,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;