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

diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c
index af4fa88b7..1bf820e67 100644
--- a/tests/test-fbufmode.c
+++ b/tests/test-fbufmode.c
@@ -1,10 +1,10 @@
 /* Test of fbufmode() function.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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,8 +12,7 @@
    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.  */
 
@@ -21,9 +20,20 @@
 
 #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__); \
+          fflush (stderr);						     \
+          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.  */