striconveh: Simplify last commit.

[gnulib.git] / tests / test-fbufmode.c

diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c
index 39e12fd..da32834 100644 (file)
--- 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-2010 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,9 @@
 
 #include "fbufmode.h"
 
-#include <stdlib.h>
+#include <stdio.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
 
 #define TESTFILE "t-fbufmode.tmp"
 
@@ -49,13 +48,19 @@ main ()
     goto skip;
   ASSERT (fbufmode (fp) == _IONBF);
 
-  if (setvbuf (fp, buf, _IOLBF, 5))
-    goto skip;
-  ASSERT (fbufmode (fp) == _IOLBF);
-
-  if (setvbuf (fp, buf, _IOFBF, 5))
-    goto skip;
-  ASSERT (fbufmode (fp) == _IOFBF);
+  /* This setvbuf call can fail, e.g. on HP-UX 11.  */
+  if (setvbuf (fp, buf, _IOLBF, 5) == 0)
+    {
+      /* 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.  */
+  if (setvbuf (fp, buf, _IOFBF, 5) == 0)
+    {
+      ASSERT (fbufmode (fp) == _IOFBF);
+    }
 
   fclose (fp);