PƔdraig Brady wrote:
...
>> FAIL: tail-2/follow-name
>
> This should work around the issue.
>
> commit 2b82ee76df6c4c36d854218d3407d9fa9170ef0a
> Author: PƔdraig Brady <address@hidden>
> Date: Sun Oct 9 11:25:34 2011 +0100
>
> tests: avoid a false failure on systems without inotify
>
> * tests/tail-2/follow-name: Exclude the inotify warning
> from the comparison.
> Reported by Bruno Haible.
>
> diff --git a/tests/tail-2/follow-name b/tests/tail-2/follow-name
> index ef9434a..e34b779 100755
> --- a/tests/tail-2/follow-name
> +++ b/tests/tail-2/follow-name
> @@ -27,6 +27,10 @@ EOF
> timeout 10 tail --follow=name no-such > out 2> err
> test $? = 1 || fail=1
>
> +# Remove an inconsequential inotify warning so
> +# we can compare against the above error
> +sed '/inotify cannot be used/d' err > k && mv k err
Thanks.
I massaged that into input that'd work with "git am" and applied it:
>From 2629776078835e93b854eb171f705b9d4ce5edf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Sun, 9 Oct 2011 11:25:34 +0100
Subject: [PATCH] tests: avoid a false failure on systems without inotify
* tests/tail-2/follow-name: Exclude the inotify warning
from the comparison.
Reported by Bruno Haible.
---
tests/tail-2/follow-name | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/tail-2/follow-name b/tests/tail-2/follow-name
index ef9434a..e34b779 100755
--- a/tests/tail-2/follow-name
+++ b/tests/tail-2/follow-name
@@ -27,6 +27,10 @@ EOF
timeout 10 tail --follow=name no-such > out 2> err
test $? = 1 || fail=1
+# Remove an inconsequential inotify warning so
+# we can compare against the above error
+sed '/inotify cannot be used/d' err > k && mv k err
+
compare err exp || fail=1
Exit $fail
--
1.7.7.143.g13ba4