Enable tests for fflush after ungetc.

diff --git a/ChangeLog b/ChangeLog
index 395fefa36ef0ac12c8583c5ff7f3fa147bf31de7..a905ee33ef2ef22f264e5daa8a6e621ca2d5107b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-15  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-fflush2.sh: Invoke test-fflush2 twice.
+       * tests/test-fflush2.c (ASSERT): Always fail.
+       (main): Add two tests for fflush() after ungetc(), taking into account
+       the Austin Group's clarification.
+       Suggested by Eric Blake.
+
 2009-01-15  Albert Chin-A-Young  <china@thewrittenword.com>
 
        mktime.m4: remove K&R-style function prototypes

diff --git a/tests/test-fflush2.c b/tests/test-fflush2.c
index 105a57551e8031af410388ccdc5af14b8e75bb83..5ec1e55048f859ec6a03226018f9def3139ae820 100644 (file)
--- a/tests/test-fflush2.c
+++ b/tests/test-fflush2.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible fflush() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 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
@@ -20,9 +20,7 @@
 
 #include <stdlib.h>
 
-/* This test can only be made to work on specific platforms.  */
-#if defined _IO_ferror_unlocked || defined __sferror /* GNU libc, BeOS; FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */
-# define ASSERT(expr) \
+#define ASSERT(expr) \
   do                                                                        \
     {                                                                       \
       if (!(expr))                                                          \
@@ -33,57 +31,85 @@
         }                                                                   \
     }                                                                       \
   while (0)
-#else
-# define ASSERT(expr) \
-  do                                                                        \
-    {                                                                       \
-      if (!(expr))                                                          \
-        {                                                                   \
-          printf ("Skipping test: expected failure on this platform\n");     \
-          exit (77);                                                        \
-        }                                                                   \
-    }                                                                       \
-  while (0)
-#endif
 
 int
 main (int argc, char **argv)
 {
-#if 0
-  /* Check fflush after a backup ungetc() call.  This is case 1 in terms of
-     <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>.
-     The Austin Group has not yet decided how this should behave.  */
-#endif
-#if 0
-  /* Check fflush after a non-backup ungetc() call.  This is case 2 in terms of
-     <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>.
-     The Austin Group has not yet decided how this should behave.  */
-  /* Check that fflush after a non-backup ungetc() call discards the ungetc
-     buffer.  This is mandated by POSIX
-     <http://www.opengroup.org/susv3/functions/ungetc.html>:
-       "The value of the file-position indicator for the stream after
-        reading or discarding all pushed-back bytes shall be the same
-        as it was before the bytes were pushed back."  */
   int c;
 
-  c = fgetc (stdin);
-  ASSERT (c == '#');
+  if (argc > 1)
+    switch (argv[1][0])
+      {
+      case '1':
+       /* Check fflush after a backup ungetc() call.  This is case 1a in
+          terms of
+          <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>,
+          according to the Austin Group's resolution on 2009-01-08.  */
+
+       c = fgetc (stdin);
+       ASSERT (c == '#');
+
+       c = fgetc (stdin);
+       ASSERT (c == '!');
+
+       /* Here the file-position indicator must be 2.  */
+
+       c = ungetc ('!', stdin);
+       ASSERT (c == '!');
+
+       fflush (stdin);
+
+       /* Here the file-position indicator must be 1.  */
+
+       c = fgetc (stdin);
+       ASSERT (c == '!');
+
+       c = fgetc (stdin);
+       ASSERT (c == '/');
+
+       return 0;
+
+      case '2':
+       /* Check fflush after a non-backup ungetc() call.  This is case 2a in
+          terms of
+          <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>,
+          according to the Austin Group's resolution on 2009-01-08.  */
+       /* Check that fflush after a non-backup ungetc() call discards the
+          ungetc buffer.  This is mandated by POSIX
+          <http://www.opengroup.org/susv3/functions/ungetc.html>:
+            "The value of the file-position indicator for the stream after
+             reading or discarding all pushed-back bytes shall be the same
+             as it was before the bytes were pushed back."
+          <http://www.opengroup.org/austin/aardvark/latest/xshbug3.txt>
+            "[After fflush(),] the file offset of the underlying open file
+             description shall be set to the file position of the stream, and
+             any characters pushed back onto the stream by ungetc() or
+             ungetwc() that have not subsequently been read from the stream
+             shall be discarded."  */
+
+       c = fgetc (stdin);
+       ASSERT (c == '#');
+
+       c = fgetc (stdin);
+       ASSERT (c == '!');
+
+       /* Here the file-position indicator must be 2.  */
 
-  c = fgetc (stdin);
-  ASSERT (c == '!');
+       c = ungetc ('@', stdin);
+       ASSERT (c == '@');
 
-  /* Here the file-position indicator must be 2.  */
+       fflush (stdin);
 
-  c = ungetc ('@', stdin);
-  ASSERT (c == '@');
+       /* Here the file-position indicator must be 1.  */
 
-  fflush (stdin);
+       c = fgetc (stdin);
+       ASSERT (c == '!');
 
-  /* Here the file-position indicator must be 2 again.  */
+       c = fgetc (stdin);
+       ASSERT (c == '/');
 
-  c = fgetc (stdin);
-  ASSERT (c == '/');
-#endif
+       return 0;
+      }
 
-  return 0;
+  return 1;
 }

diff --git a/tests/test-fflush2.sh b/tests/test-fflush2.sh
index 5c3fc979a66784f6d699c0991c62cf8b15ce8ce5..ef77fa485ee8107c1eb96503616286a8ab3d0262 100755 (executable)
--- a/tests/test-fflush2.sh
+++ b/tests/test-fflush2.sh
@@ -2,7 +2,8 @@
 
 # Execute the test only with seekable input stream.
 # The behaviour of fflush() on a non-seekable input stream is undefined.
-./test-fflush2${EXEEXT} < "$srcdir/test-fflush2.sh" || exit $?
+./test-fflush2${EXEEXT} 1 < "$srcdir/test-fflush2.sh" || exit $?
+./test-fflush2${EXEEXT} 2 < "$srcdir/test-fflush2.sh" || exit $?
 #cat "$srcdir/test-fflush2.sh" | ./test-fflush2${EXEEXT} || exit $?
 
 exit 0