X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-freading.c;h=af4a03b706ddb9baf7a82c8c6be27400af0a34b4;hb=dd91a295844a6e89ce67087164ea0f2e979b4b70;hp=e51d7ab184310442c74cde661984e13a0fc6d77f;hpb=503e2514a1404a19a00117845216993a3c2ccf5f;p=gnulib.git

diff --git a/tests/test-freading.c b/tests/test-freading.c
index e51d7ab18..af4a03b70 100644
--- a/tests/test-freading.c
+++ b/tests/test-freading.c
@@ -1,10 +1,10 @@
 /* Test of freading() function.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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,145 +12,119 @@
    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>, 2007.  */
 
 #include <config.h>
 
+/* None of the files accessed by this test are large, so disable the
+   fseek link warning if we are not using the gnulib fseek module.  */
+#define _GL_NO_LARGE_FILES
 #include "freading.h"
 
-#include <stdlib.h>
+#include <stdio.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
 
 #define TESTFILE "t-freading.tmp"
 
 int
-main ()
+main (void)
 {
   FILE *fp;
 
   /* Create a file with some contents.  Write-only file is never reading.  */
   fp = fopen (TESTFILE, "w");
-  if (fp == NULL)
-    goto skip;
+  ASSERT (fp);
   ASSERT (!freading (fp));
-  if (fwrite ("foobarsh", 1, 8, fp) < 8)
-    goto skip;
+  ASSERT (fwrite ("foobarsh", 1, 8, fp) == 8);
   ASSERT (!freading (fp));
-  if (fclose (fp))
-    goto skip;
+  ASSERT (fclose (fp) == 0);
 
   /* Open it in read-only mode.  Read-only file is always reading.  */
   fp = fopen (TESTFILE, "r");
-  if (fp == NULL)
-    goto skip;
+  ASSERT (fp);
   ASSERT (freading (fp));
-  if (fgetc (fp) != 'f')
-    goto skip;
+  ASSERT (fgetc (fp) == 'f');
   ASSERT (freading (fp));
-  if (fseek (fp, 2, SEEK_CUR))
-    goto skip;
+  ASSERT (fseek (fp, 2, SEEK_CUR) == 0);
   ASSERT (freading (fp));
-  if (fgetc (fp) != 'b')
-    goto skip;
+  ASSERT (fgetc (fp) == 'b');
   ASSERT (freading (fp));
   fflush (fp);
   ASSERT (freading (fp));
-  if (fgetc (fp) != 'a')
-    goto skip;
+  ASSERT (fgetc (fp) == 'a');
   ASSERT (freading (fp));
-  if (fseek (fp, 0, SEEK_END))
-    goto skip;
+  ASSERT (fseek (fp, 0, SEEK_END) == 0);
   ASSERT (freading (fp));
-  if (fclose (fp))
-    goto skip;
+  ASSERT (fclose (fp) == 0);
 
   /* Open it in read-write mode.  POSIX requires a reposition (fseek,
      fsetpos, rewind) or EOF when transitioning from read to write;
      freading is only deterministic after input or output, but this
      test case should be portable even on open, after reposition, and
      at EOF.  */
+  /* First a scenario with only fgetc, fseek, fputc.  */
   fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    goto skip;
+  ASSERT (fp);
   ASSERT (!freading (fp));
-  if (fgetc (fp) != 'f')
-    goto skip;
+  ASSERT (fgetc (fp) == 'f');
   ASSERT (freading (fp));
-  if (fseek (fp, 2, SEEK_CUR))
-    goto skip;
+  ASSERT (fseek (fp, 2, SEEK_CUR) ==  0);
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
-  if (fgetc (fp) != 'b')
-    goto skip;
+  ASSERT (fgetc (fp) == 'b');
   ASSERT (freading (fp));
   /* This fseek call is necessary when switching from reading to writing.
      See the description of fopen(), ISO C 99 7.19.5.3.(6).  */
-  if (fseek (fp, 0, SEEK_CUR) != 0)
-    goto skip;
+  ASSERT (fseek (fp, 0, SEEK_CUR) == 0);
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
-  if (fputc ('z', fp) != 'z')
-    goto skip;
+  ASSERT (fputc ('x', fp) == 'x');
   ASSERT (!freading (fp));
-  if (fseek (fp, 0, SEEK_END))
-    goto skip;
-  ASSERT (!freading (fp));
-  if (fclose (fp))
-    goto skip;
+  ASSERT (fseek (fp, 0, SEEK_END) == 0);
+  /* freading (fp) is undefined here, because on some implementations (e.g.
+     glibc) fseek causes a buffer to be read.
+     fwriting (fp) is undefined as well.  */
+  ASSERT (fclose (fp) == 0);
 
   /* Open it in read-write mode.  POSIX requires a reposition (fseek,
      fsetpos, rewind) or EOF when transitioning from read to write;
      freading is only deterministic after input or output, but this
      test case should be portable even on open, after reposition, and
      at EOF.  */
+  /* Here a scenario that includes fflush.  */
   fp = fopen (TESTFILE, "r+");
-  if (fp == NULL)
-    goto skip;
+  ASSERT (fp);
   ASSERT (!freading (fp));
-  if (fgetc (fp) != 'f')
-    goto skip;
+  ASSERT (fgetc (fp) == 'f');
   ASSERT (freading (fp));
-  if (fseek (fp, 2, SEEK_CUR))
-    goto skip;
+  ASSERT (fseek (fp, 2, SEEK_CUR) == 0);
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
-  if (fgetc (fp) != 'b')
-    goto skip;
+  ASSERT (fgetc (fp) == 'b');
   ASSERT (freading (fp));
   fflush (fp);
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
-  if (fgetc (fp) != 'a')
-    goto skip;
+  ASSERT (fgetc (fp) == 'x');
   ASSERT (freading (fp));
   /* This fseek call is necessary when switching from reading to writing.
      See the description of fopen(), ISO C 99 7.19.5.3.(6).  */
-  if (fseek (fp, 0, SEEK_CUR) != 0)
-    goto skip;
+  ASSERT (fseek (fp, 0, SEEK_CUR) == 0);
   /* freading (fp) is undefined here, but fwriting (fp) is false.  */
-  if (fputc ('z', fp) != 'z')
-    goto skip;
-  ASSERT (!freading (fp));
-  if (fseek (fp, 0, SEEK_END))
-    goto skip;
+  ASSERT (fputc ('z', fp) == 'z');
   ASSERT (!freading (fp));
-  if (fclose (fp))
-    goto skip;
+  ASSERT (fseek (fp, 0, SEEK_END) == 0);
+  /* freading (fp) is undefined here, because on some implementations (e.g.
+     glibc) fseek causes a buffer to be read.
+     fwriting (fp) is undefined as well.  */
+  ASSERT (fclose (fp) == 0);
 
   /* Open it in append mode.  Write-only file is never reading.  */
   fp = fopen (TESTFILE, "a");
-  if (fp == NULL)
-    goto skip;
+  ASSERT (fp);
   ASSERT (!freading (fp));
-  if (fwrite ("bla", 1, 3, fp) < 3)
-    goto skip;
+  ASSERT (fwrite ("bla", 1, 3, fp) == 3);
   ASSERT (!freading (fp));
-  if (fclose (fp))
-    goto skip;
-
+  ASSERT (fclose (fp) == 0);
+  ASSERT (remove (TESTFILE) == 0);
   return 0;
-
- skip:
-  fprintf (stderr, "Skipping test: file operations failed.\n");
-  return 77;
 }