summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-12-12 14:44:46 +0100
committerJim Meyering <meyering@redhat.com>2009-12-12 17:40:42 +0100
commitd9ba88597409c6c3f89c2ab173369cc1ec26507d (patch)
treeb3b9dc9aa397ba80f0f80a7d4ab11e662fde58bf
parent96047b77ecf41a9b6e28d50b4cbbdb543f4249d9 (diff)
downloadcoreutils-d9ba88597409c6c3f89c2ab173369cc1ec26507d.tar.xz
tests: tail-without-inotify: avoid spurious test failure
* tests/tail-2/wait: Account for the possibility that the kernel lacks inotify support. Reported by Chris Clayton.
-rw-r--r--THANKS1
-rwxr-xr-xtests/tail-2/wait3
2 files changed, 3 insertions, 1 deletions
diff --git a/THANKS b/THANKS
index 3b03587d6..acdfd6b2f 100644
--- a/THANKS
+++ b/THANKS
@@ -102,6 +102,7 @@ Carlos Canau Carlos.Canau@relay.puug.pt
Charles Karney karney@pppl.gov
Charles Randall crandall@matchlogic.com
Chip Salzenberg chip@valinux.com
+Chris Clayton chris2553@googlemail.com
Chris Faylor cgf@cygnus.com
Chris J. Bednar cjb@AdvancedDataSolutions.com
Chris Lesniewski ctl@mit.edu
diff --git a/tests/tail-2/wait b/tests/tail-2/wait
index 9392ade23..bdc115ae9 100755
--- a/tests/tail-2/wait
+++ b/tests/tail-2/wait
@@ -54,7 +54,8 @@ for inotify in ---disable-inotify ''; do
timeout 1 tail -s0.1 -F $inotify not_here
test $? = 124 || fail=1
-
+ grep -v 'tail: inotify cannot be used, reverting to polling:' tail.err > x
+ mv x tail.err
test -s tail.err && fail=1
:>tail.err