update nearly all FSF copyright year lists to include 2010

[pspp] / tests / test-flock.c

diff --git a/tests/test-flock.c b/tests/test-flock.c
index a1872cda72669eb3b6148d1ea8defbb662b9684f..7dcb94f054a8f4c7bb98f6f16a03730bb07429ef 100644 (file)
--- a/tests/test-flock.c
+++ b/tests/test-flock.c
@@ -1,9 +1,9 @@
 /* Test of flock() function.
 /* 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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,25 +14,18 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
+#include <config.h>

 
 #include <sys/file.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 "signature.h"
+SIGNATURE_CHECK (flock, int, (int, int));
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "macros.h"

 
 static void
 test_shared (const char *file, int fd)
 
 static void
 test_shared (const char *file, int fd)


@@ -48,7 +41,7 @@ test_shared (const char *file, int fd)
   ASSERT (fd2 >= 0);
 
   r = flock (fd2, LOCK_SH | LOCK_NB);
   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);
 
   ASSERT (flock (fd, LOCK_UN) == 0);
   ASSERT (close (fd2) == 0);


@@ -66,7 +59,7 @@ test_exclusive (const char *file, int fd)
   ASSERT (fd2 >= 0);
 
   r = flock (fd2, LOCK_SH | LOCK_NB);
   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);
 
   ASSERT (flock (fd, LOCK_UN) == 0);
   ASSERT (close (fd2) == 0);