copy-acl: enhance Solaris ACL error handling

[gnulib.git] / tests / test-flock.c

diff --git a/tests/test-flock.c b/tests/test-flock.c
index f71532e..7dcb94f 100644 (file)
--- a/tests/test-flock.c
+++ b/tests/test-flock.c
@@ -1,9 +1,9 @@
 /* Test of flock() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,26 +16,16 @@
 
 #include <config.h>
 
+#include <sys/file.h>
+
+#include "signature.h"
+SIGNATURE_CHECK (flock, int, (int, int));
+
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include <sys/file.h>
-
-#define ASSERT(expr) \
-  do                                                                   \
-    {                                                                  \
-      if (!(expr))                                                     \
-        {                                                              \
-         fprintf (stderr, "%s:%d: assertion failed, errno = %d\n",     \
-                  __FILE__, __LINE__, errno);                          \
-          fflush (stderr);                                             \
-          abort ();                                                    \
-        }                                                              \
-    }                                                                  \
-  while (0)
+#include "macros.h"
 
 static void
 test_shared (const char *file, int fd)
@@ -51,7 +41,7 @@ test_shared (const char *file, int fd)
   ASSERT (fd2 >= 0);
 
   r = flock (fd2, LOCK_SH | LOCK_NB);
-  ASSERT (r == 0);             /* Was able to acquire a second shared lock. */
+  ASSERT (r == 0);              /* Was able to acquire a second shared lock. */
 
   ASSERT (flock (fd, LOCK_UN) == 0);
   ASSERT (close (fd2) == 0);
@@ -69,7 +59,7 @@ test_exclusive (const char *file, int fd)
   ASSERT (fd2 >= 0);
 
   r = flock (fd2, LOCK_SH | LOCK_NB);
-  ASSERT (r == -1);            /* Was unable to acquire a second exclusive lock. */
+  ASSERT (r == -1);             /* Was unable to acquire a second exclusive lock. */
 
   ASSERT (flock (fd, LOCK_UN) == 0);
   ASSERT (close (fd2) == 0);