X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fbufmode.c;h=044d872b36cc49927c64f67691ed5761910c2c85;hb=70f2c04b76c463b54adb0c1db6de2b2c5c40661c;hp=af4fa88b7610365b298206802e7460349bc3c34f;hpb=66b599796cae5a74700e952717f31055d8430112;p=gnulib.git

diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c
index af4fa88b7..044d872b3 100644
--- a/tests/test-fbufmode.c
+++ b/tests/test-fbufmode.c
@@ -21,9 +21,19 @@
 
 #include "fbufmode.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
 
 #define TESTFILE "t-fbufmode.tmp"
 
@@ -52,7 +62,9 @@ main ()
   /* This setvbuf call can fail, e.g. on HP-UX 11.  */
   if (setvbuf (fp, buf, _IOLBF, 5) == 0)
     {
-      ASSERT (fbufmode (fp) == _IOLBF);
+      /* mingw's setvbuf implements _IOLBF the same way as _IOFBF.  */
+      ASSERT (fbufmode (fp) == _IOLBF
+	      || fbufmode (fp) == _IOFBF);
     }
 
   /* This setvbuf call can fail, e.g. on HP-UX 11.  */