From e8dd490b46444e82673618f34b4ef1b3bf0bf382 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 22 Jun 2012 12:02:54 +0200 Subject: [PATCH 1/1] fbufmode test: Don't test unportable behaviour. * tests/test-fbufmode.c (test_mode): New function, extracted from main. (main): Invoke it three times. Reported by Szabolcs Nagy and Rich Felker . --- ChangeLog | 8 ++++++ tests/test-fbufmode.c | 77 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 64 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef0257a3f..7d53a42e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-06-22 Bruno Haible + + fbufmode test: Don't test unportable behaviour. + * tests/test-fbufmode.c (test_mode): New function, extracted from main. + (main): Invoke it three times. + Reported by Szabolcs Nagy + and Rich Felker . + 2012-06-21 Bruno Haible gnulib-tool: Refactor inctests variable. diff --git a/tests/test-fbufmode.c b/tests/test-fbufmode.c index 2b762e791..76169c718 100644 --- a/tests/test-fbufmode.c +++ b/tests/test-fbufmode.c @@ -26,45 +26,80 @@ #define TESTFILE "t-fbufmode.tmp" -int -main () +/* ISO C99 disallows more than one setvbuf call on a given stream, + and HP-UX 11 and musl libc indeed don't support such use of setvbuf. + Therefore allocate a new stream for each possible mode value. */ +static int +test_mode (int mode) { FILE *fp; char buf[5]; - /* Create a file with some contents. */ - fp = fopen (TESTFILE, "w"); - if (fp == NULL) - goto skip; - if (fwrite ("foobarsh", 1, 8, fp) < 8) - goto skip; - if (fclose (fp)) - goto skip; - /* Open it for reading. */ fp = fopen (TESTFILE, "r"); - if (setvbuf (fp, NULL, _IONBF, 0)) - goto skip; - ASSERT (fbufmode (fp) == _IONBF); - - /* This setvbuf call can fail, e.g. on HP-UX 11. */ - if (setvbuf (fp, buf, _IOLBF, 5) == 0) + switch (mode) { + case _IONBF: + ASSERT (setvbuf (fp, NULL, _IONBF, 0) == 0); + ASSERT (fbufmode (fp) == _IONBF); + break; + + case _IOLBF: + ASSERT (setvbuf (fp, buf, _IOLBF, 5) == 0); /* mingw's setvbuf implements _IOLBF the same way as _IOFBF. */ ASSERT (fbufmode (fp) == _IOLBF || fbufmode (fp) == _IOFBF); - } + break; - /* This setvbuf call can fail, e.g. on HP-UX 11. */ - if (setvbuf (fp, buf, _IOFBF, 5) == 0) - { + case _IOFBF: + ASSERT (setvbuf (fp, buf, _IOFBF, 5) == 0); ASSERT (fbufmode (fp) == _IOFBF); + break; + + default: + break; } fclose (fp); return 0; +} + +int +main () +{ + int ret; + + /* Create a file with some contents. */ + { + FILE *fp; + + fp = fopen (TESTFILE, "w"); + if (fp == NULL) + goto skip; + if (fwrite ("foobarsh", 1, 8, fp) < 8) + goto skip; + if (fclose (fp)) + goto skip; + } + + ret = test_mode (_IONBF); + if (ret != 0) + goto fail; + + ret = test_mode (_IOLBF); + if (ret != 0) + goto fail; + + ret = test_mode (_IOFBF); + if (ret != 0) + goto fail; + + return 0; + + fail: + return ret; skip: fprintf (stderr, "Skipping test: file operations failed.\n"); -- 2.11.0