--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-24  Bruno Haible  <bruno@clisp.org>
+
+	Enhance fgetc, fputc tests.
+	* tests/test-fgetc.c (main): Also test the stream's error indicator.
+	* tests/test-fputc.c (main): Likewise.
+
 2011-09-24  Bruno Haible  <bruno@clisp.org>
 
 	write: Support for MSVC 9.

--- a/tests/test-fgetc.c
+++ b/tests/test-fgetc.c
@@ -51,6 +51,7 @@
     errno = 0;
     ASSERT (fgetc (fp) == EOF);
     ASSERT (errno == EBADF);
+    ASSERT (ferror (fp));
     fclose (fp);
   }
 
@@ -63,6 +64,7 @@
         errno = 0;
         ASSERT (fgetc (fp) == EOF);
         ASSERT (errno == EBADF);
+        ASSERT (ferror (fp));
         fclose (fp);
       }
   }
@@ -73,6 +75,7 @@
         errno = 0;
         ASSERT (fgetc (fp) == EOF);
         ASSERT (errno == EBADF);
+        ASSERT (ferror (fp));
         fclose (fp);
       }
   }

--- a/tests/test-fputc.c
+++ b/tests/test-fputc.c
@@ -43,6 +43,7 @@
     errno = 0;
     ASSERT (fputc ('x', fp) == EOF);
     ASSERT (errno == EBADF);
+    ASSERT (ferror (fp));
     fclose (fp);
   }
 
@@ -56,6 +57,7 @@
         errno = 0;
         ASSERT (fputc ('x', fp) == EOF);
         ASSERT (errno == EBADF);
+        ASSERT (ferror (fp));
         fclose (fp);
       }
   }
@@ -67,6 +69,7 @@
         errno = 0;
         ASSERT (fputc ('x', fp) == EOF);
         ASSERT (errno == EBADF);
+        ASSERT (ferror (fp));
         fclose (fp);
       }
   }