X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-binary-io.c;h=8e5d193f69dfe527f765526d7cdb4883f085cd24;hb=279067b9021cfd0935711cae3f3297ae4b3808af;hp=3f5e9ccbf92a032020dea93517c91b0bc3e6f3bd;hpb=d33bbb6dccd748bbe0cefcb8f7f9b6ba690f2401;p=gnulib.git

diff --git a/tests/test-binary-io.c b/tests/test-binary-io.c
index 3f5e9ccbf..8e5d193f6 100644
--- a/tests/test-binary-io.c
+++ b/tests/test-binary-io.c
@@ -1,10 +1,10 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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, or (at your option)
-   any later version.
+   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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,14 +12,11 @@
    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/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "binary-io.h"
 
@@ -30,25 +27,26 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
 
 int
 main ()
 {
   /* Test the O_BINARY macro.  */
   {
-    int fd = open ("output2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY);
+    int fd =
+      open ("t-bin-out2.tmp", O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0600);
     if (write (fd, "Hello\n", 6) < 0)
       exit (1);
     close (fd);
   }
   {
     struct stat statbuf;
-    if (stat ("output2.tmp", &statbuf) < 0)
+    if (stat ("t-bin-out2.tmp", &statbuf) < 0)
       exit (1);
     ASSERT (statbuf.st_size == 6);
   }
-  unlink ("output2.tmp");
+  unlink ("t-bin-out2.tmp");
 
   /* Test the SET_BINARY macro.  */
   SET_BINARY (1);
@@ -57,7 +55,7 @@ main ()
   fclose (stderr);
   {
     struct stat statbuf;
-    if (stat ("output.tmp", &statbuf) < 0)
+    if (stat ("t-bin-out1.tmp", &statbuf) < 0)
       exit (1);
     ASSERT (statbuf.st_size == 6);
   }