From be933433b7ad24c4087c187b0107690d6da174ef Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 4 Apr 2008 06:58:46 -0600 Subject: [PATCH] Make test-fseeko.c failures meaningful. * tests/test-fseeko.c: Print line number on failure. * tests/test-fseek.c: Likewise. Reported by Nelson H. F. Beebe. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ tests/test-fseek.c | 48 +++++++++++++++++++++++++++++------------------- tests/test-fseeko.c | 53 ++++++++++++++++++++++++++++++----------------------- 3 files changed, 64 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1a3041ee..4d391603c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-04-04 Eric Blake + Make test-fseeko.c failures meaningful. + * tests/test-fseeko.c: Print line number on failure. + * tests/test-fseek.c: Likewise. + Reported by Nelson H. F. Beebe. + Improve strtod bug detection check. * m4/strtod.m4 (gl_FUNC_STRTOD): Also check for hex-float parsing, required for Solaris 10. diff --git a/tests/test-fseek.c b/tests/test-fseek.c index 0c7db958d..c38c48557 100644 --- a/tests/test-fseek.c +++ b/tests/test-fseek.c @@ -1,5 +1,5 @@ /* Test of fseek() 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 it under the terms of the GNU General Public License as published by @@ -19,33 +19,43 @@ #include #include +#include + +#define ASSERT(expr) \ + do \ + { \ + if (!(expr)) \ + { \ + fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ + abort (); \ + } \ + } \ + while (0) int main (int argc, char **argv) { - /* Assume stdin is non-empty and seekable iff argc > 1. */ + /* Assume stdin is non-empty, seekable, and starts with '#!/bin/sh' + iff argc > 1. */ int expected = argc > 1 ? 0 : -1; - if (fseek (stdin, 0, SEEK_CUR) != expected) - return 1; + ASSERT (fseek (stdin, 0, SEEK_CUR) == expected); if (argc > 1) { - /* Test that fseek discards ungetc data. */ + /* Test that fseek discards previously read ungetc data. */ int ch = fgetc (stdin); - if (ch == EOF) - return 1; - if (ungetc (ch ^ 0xff, stdin) != (ch ^ 0xff)) - return 1; - if (fseek (stdin, 0, SEEK_END)) - return 1; - if (fgetc (stdin) != EOF) - return 1; + ASSERT (ch == '#'); + ASSERT (ungetc (ch, stdin) == ch); + ASSERT (fseek (stdin, 2, SEEK_SET) == 0); + /* Test that fseek discards random ungetc data. */ + ch = fgetc (stdin); + ASSERT (ch == '/'); + ASSERT (ungetc (ch ^ 0xff, stdin) == (ch ^ 0xff)); + ASSERT (fseek (stdin, 0, SEEK_END) == 0); + ASSERT (fgetc (stdin) == EOF); /* Test that fseek resets end-of-file marker. */ - if (!feof (stdin)) - return 1; - if (fseek (stdin, 0, SEEK_END)) - return 1; - if (feof (stdin)) - return 1; + ASSERT (feof (stdin)); + ASSERT (fseek (stdin, 0, SEEK_END) == 0); + ASSERT (!feof (stdin)); } return 0; } diff --git a/tests/test-fseeko.c b/tests/test-fseeko.c index 25289cef0..d7ec443ae 100644 --- a/tests/test-fseeko.c +++ b/tests/test-fseeko.c @@ -1,5 +1,5 @@ /* Test of fseeko() 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 it under the terms of the GNU General Public License as published by @@ -19,39 +19,46 @@ #include #include +#include -/* Get off_t. */ -#include +#define ASSERT(expr) \ + do \ + { \ + if (!(expr)) \ + { \ + fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ + abort (); \ + } \ + } \ + while (0) int main (int argc, char **argv) { - /* Assume stdin is non-empty and seekable iff argc > 1. */ + /* Assume stdin is non-empty, seekable, and starts with '#!/bin/sh' + iff argc > 1. */ int expected = argc > 1 ? 0 : -1; /* Exit with success only if fseek/fseeko agree. */ - int r1 = fseeko (stdin, (off_t)0, SEEK_CUR); - int r2 = fseek (stdin, (long)0, SEEK_CUR); - if (r1 != r2 || r1 != expected) - return 1; + int r1 = fseeko (stdin, 0, SEEK_CUR); + int r2 = fseek (stdin, 0, SEEK_CUR); + ASSERT (r1 == r2 && r1 == expected); if (argc > 1) { - /* Test that fseek discards ungetc data. */ + /* Test that fseek discards previously read ungetc data. */ int ch = fgetc (stdin); - if (ch == EOF) - return 1; - if (ungetc (ch ^ 0xff, stdin) != (ch ^ 0xff)) - return 1; - if (fseeko (stdin, (off_t) 0, SEEK_END)) - return 1; - if (fgetc (stdin) != EOF) - return 1; + ASSERT (ch == '#'); + ASSERT (ungetc (ch, stdin) == ch); + ASSERT (fseeko (stdin, 2, SEEK_SET) == 0); + /* Test that fseek discards random ungetc data. */ + ch = fgetc (stdin); + ASSERT (ch == '/'); + ASSERT (ungetc (ch ^ 0xff, stdin) == (ch ^ 0xff)); + ASSERT (fseeko (stdin, 0, SEEK_END) == 0); + ASSERT (fgetc (stdin) == EOF); /* Test that fseek resets end-of-file marker. */ - if (!feof (stdin)) - return 1; - if (fseeko (stdin, (off_t) 0, SEEK_END)) - return 1; - if (feof (stdin)) - return 1; + ASSERT (feof (stdin)); + ASSERT (fseeko (stdin, 0, SEEK_END) == 0); + ASSERT (!feof (stdin)); } return 0; } -- 2.11.0