X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-idpriv-drop.c;h=1a22ccf23e7b71894a8d9f36d8b28b1db511cab0;hb=18c7880d06e42284d765ef2cb7be4019fdcd9281;hp=0da443fc34e90988e17c75f160a68247ca505c27;hpb=deb76fe23dcf27a67ec00295494c7c4728e3b110;p=gnulib.git

diff --git a/tests/test-idpriv-drop.c b/tests/test-idpriv-drop.c
index 0da443fc3..1a22ccf23 100644
--- a/tests/test-idpriv-drop.c
+++ b/tests/test-idpriv-drop.c
@@ -1,5 +1,5 @@
 /* Test of dropping uid/gid privileges of the current process permanently.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-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
@@ -24,17 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 static void
 show_uids ()
@@ -45,13 +35,13 @@ show_uids ()
   uid_t saved;
   ASSERT (getresuid (&real, &effective, &saved) >= 0);
   printf ("uids: real=%d effective=%d saved=%d",
-	  (int) real, (int) effective, (int) saved);
+          (int) real, (int) effective, (int) saved);
 #elif HAVE_GETEUID
   printf ("uids: real=%d effective=%d",
-	  (int) getuid (), (int) geteuid());
+          (int) getuid (), (int) geteuid ());
 #elif HAVE_GETUID
   printf ("uids: real=%d",
-	  (int) getuid ());
+          (int) getuid ());
 #endif
 }
 
@@ -64,13 +54,13 @@ show_gids ()
   gid_t saved;
   ASSERT (getresgid (&real, &effective, &saved) >= 0);
   printf ("gids: real=%d effective=%d saved=%d",
-	  (int) real, (int) effective, (int) saved);
+          (int) real, (int) effective, (int) saved);
 #elif HAVE_GETEGID
   printf ("gids: real=%d effective=%d",
-	  (int) getgid (), (int) getegid());
+          (int) getgid (), (int) getegid ());
 #elif HAVE_GETGID
   printf ("gids: real=%d",
-	  (int) getgid ());
+          (int) getgid ());
 #endif
 }
 
@@ -104,7 +94,7 @@ main (int argc, char *argv[])
     {
       const char *arg = argv[i];
       if (strcmp (arg, "-v") == 0)
-	verbose = true;
+        verbose = true;
     }
 
   if (verbose)
@@ -122,9 +112,9 @@ main (int argc, char *argv[])
     uid_t effective;
     uid_t saved;
     if (getresuid (&real, &effective, &saved) < 0
-	|| real != uid
-	|| effective != uid
-	|| saved != uid)
+        || real != uid
+        || effective != uid
+        || saved != uid)
       abort ();
   }
 #else
@@ -143,9 +133,9 @@ main (int argc, char *argv[])
     gid_t effective;
     gid_t saved;
     if (getresgid (&real, &effective, &saved) < 0
-	|| real != gid
-	|| effective != gid
-	|| saved != gid)
+        || real != gid
+        || effective != gid
+        || saved != gid)
       abort ();
   }
 #else