# HG changeset patch # User Bruno Haible # Date 1286220944 -7200 # Node ID 7e5397f6cecf2ba3f67a2bf624048d6a4063b68d # Parent 38b745d4e6a4c5bbf3aa043472c7ea622a94350d read-file tests: Avoid a test failure on NonStop Kernel. * tests/test-read-file.c (main): Don't assume that /etc/resolv.conf is a regular file. Reported by Joachim Schmitz . diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-04 Bruno Haible + + read-file tests: Avoid a test failure on NonStop Kernel. + * tests/test-read-file.c (main): Don't assume that /etc/resolv.conf is + a regular file. + Reported by Joachim Schmitz . + 2010-10-03 Bruno Haible gnulib-tool: Fixes for --create-testdir with --libtool. diff --git a/tests/test-read-file.c b/tests/test-read-file.c --- a/tests/test-read-file.c +++ b/tests/test-read-file.c @@ -52,11 +52,23 @@ err = 1; } - /* Assume FILE1 is a regular file or a symlink to a regular file. */ - if (len != statbuf.st_size) + if (S_ISREG (statbuf.st_mode)) { - fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1); - err = 1; + /* 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; + } + } + else + { + /* Assume FILE1 is not empty. */ + if (len == 0) + { + fprintf (stderr, "Read nothing from %s\n", FILE1); + err = 1; + } } free (out); }