Mercurial > hg > octave-lojdl > gnulib-hg
changeset 8525:8af5a9817d07
Produce no output in expected situations. Fail in unexpected situations.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 24 Mar 2007 22:08:14 +0000 |
parents | f4094ea214e8 |
children | 67e9a647f2fa |
files | ChangeLog tests/test-read-file.c |
diffstat | 2 files changed, 65 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-24 Bruno Haible <bruno@clisp.org> + + * tests/test-read-file.c (main): Don't produce spurious output for + expected situations. Make the test fail if it encountered unexpected + results. + 2007-03-24 Bruno Haible <bruno@clisp.org> * m4/locale-fr.m4 (gt_LOCALE_FR): Remove the special-casing of NetBSD,
--- a/tests/test-read-file.c +++ b/tests/test-read-file.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/stat.h> #define FILE1 "/etc/resolv.conf" #define FILE2 "/dev/null" @@ -32,35 +33,69 @@ int main (void) { - { - size_t len; - char *out = read_file (FILE1, &len); + struct stat statbuf; + int err = 0; - if (!out) - perror ("Could not read file"); + /* We can perform the test only if the file exists and is readable. + Test whether it exists, then assume it is world-readable. */ + if (stat (FILE1, &statbuf) >= 0) + { + size_t len; + char *out = read_file (FILE1, &len); - if (out[len] != '\0') - perror ("BAD: out[len] not zero"); + if (!out) + { + perror ("Could not read file"); + err = 1; + } + else + { + if (out[len] != '\0') + { + perror ("BAD: out[len] not zero"); + err = 1; + } - printf ("Read %ld from %s...\n", (unsigned long) len, FILE1); - - free (out); - } + /* Assume FILE1 is a regular file or a symlink to a regular file. */ + if (len != statbuf.st_size) + { + fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1); + err = 1; + } + free (out); + } + } - { - size_t len; - char *out = read_file (FILE2, &len); - - if (!out) - perror ("Could not read file"); + /* We can perform the test only if the file exists and is readable. + Test whether it exists, then assume it is world-readable. */ + if (stat (FILE2, &statbuf) >= 0) + { + size_t len; + char *out = read_file (FILE2, &len); - if (out[len] != '\0') - perror ("BAD: out[len] not zero"); - - printf ("Read %ld from %s...\n", (unsigned long) len, FILE2); + if (!out) + { + perror ("Could not read file"); + err = 1; + } + else + { + if (out[len] != '\0') + { + perror ("BAD: out[len] not zero"); + err = 1; + } - free (out); - } + /* /dev/null should always be empty. Ignore statbuf.st_size, since it + is not a regular file. */ + if (len != 0) + { + fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE2); + err = 1; + } + free (out); + } + } - return 0; + return err; }