X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-canonicalize-lgpl.c;h=17cdff0970f546fcb8466c0faf7617ae62aad5e2;hb=7b7e379f77e9591d8f66739884084b530e4600cd;hp=39025fa3948ae9eba759ddd5bb90ee94c56a9674;hpb=35bd2ff772f9bc95f8e9d8e2a9bb5fc09331ed9c;p=gnulib.git

diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 39025fa39..17cdff097 100644
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -1,5 +1,5 @@
 /* Test of execution of program termination handlers.
-   Copyright (C) 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -20,6 +20,10 @@
 
 #include <stdlib.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (realpath, char *, (const char *, char *));
+SIGNATURE_CHECK (canonicalize_file_name, char *, (const char *));
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -28,29 +32,21 @@
 #include <unistd.h>
 
 #include "same-inode.h"
-
-#if !HAVE_SYMLINK
-# define symlink(a,b) (-1)
-#endif /* !HAVE_SYMLINK */
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "ignore-value.h"
+#include "macros.h"
 
 #define BASE "t-can-lgpl.tmp"
 
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
+
 int
-main ()
+main (void)
 {
-#ifdef GNULIB_CANONICALIZE
+#if GNULIB_TEST_CANONICALIZE
   /* No need to test canonicalize-lgpl module if canonicalize is also
      in use.  */
   return 0;
@@ -60,7 +56,7 @@ main ()
      any leftovers from a previous partial run.  */
   {
     int fd;
-    ASSERT (system ("rm -rf " BASE " ise") == 0);
+    ignore_value (system ("rm -rf " BASE " ise"));
     ASSERT (mkdir (BASE, 0700) == 0);
     fd = creat (BASE "/tra", 0600);
     ASSERT (0 <= fd);
@@ -72,14 +68,14 @@ main ()
     char *result = canonicalize_file_name (BASE "//./..//" BASE "/tra");
     ASSERT (result != NULL);
     ASSERT (strstr (result, "/" BASE "/tra")
-	    == result + strlen (result) - strlen ("/" BASE "/tra"));
+            == result + strlen (result) - strlen ("/" BASE "/tra"));
     free (result);
     errno = 0;
     result = canonicalize_file_name ("");
     ASSERT (result == NULL);
     ASSERT (errno == ENOENT);
     errno = 0;
-    result = canonicalize_file_name (NULL);
+    result = canonicalize_file_name (null_ptr ());
     ASSERT (result == NULL);
     ASSERT (errno == EINVAL);
   }
@@ -107,8 +103,8 @@ main ()
     {
       ASSERT (remove (BASE "/tra") == 0);
       ASSERT (rmdir (BASE) == 0);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
-	     stderr);
+      fputs ("skipping test: symlinks not supported on this file system\n",
+             stderr);
       return 77;
     }
   ASSERT (symlink ("bef", BASE "/plo") == 0);
@@ -127,7 +123,7 @@ main ()
     ASSERT (result2 != NULL);
     ASSERT (strcmp (result1, result2) == 0);
     ASSERT (strcmp (result1 + strlen (result1) - strlen ("/" BASE "/tra"),
-		    "/" BASE "/tra") == 0);
+                    "/" BASE "/tra") == 0);
     free (result1);
     free (result2);
   }
@@ -143,7 +139,7 @@ main ()
     ASSERT (strcmp (result1, result2) == 0);
     ASSERT (strcmp (result2, result3) == 0);
     ASSERT (strcmp (result1 + strlen (result1) - strlen ("/" BASE "/lum"),
-		    "/" BASE "/lum") == 0);
+                    "/" BASE "/lum") == 0);
     free (result1);
     free (result2);
     free (result3);
@@ -197,13 +193,13 @@ main ()
     ASSERT (stat ("//", &st2) == 0);
     if (SAME_INODE (st1, st2))
       {
-	ASSERT (strcmp (result1, "/") == 0);
-	ASSERT (strcmp (result2, "/") == 0);
+        ASSERT (strcmp (result1, "/") == 0);
+        ASSERT (strcmp (result2, "/") == 0);
       }
     else
       {
-	ASSERT (strcmp (result1, "//") == 0);
-	ASSERT (strcmp (result2, "//") == 0);
+        ASSERT (strcmp (result1, "//") == 0);
+        ASSERT (strcmp (result2, "//") == 0);
       }
     free (result1);
     free (result2);