[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: coreutils-8.3: a few tests fail
From: |
Jim Meyering |
Subject: |
Re: coreutils-8.3: a few tests fail |
Date: |
Wed, 13 Jan 2010 13:46:32 +0100 |
Pádraig Brady wrote:
> And can be simlified from:
> kill -0 $pid && kill $pid || fail=1
> to:
> kill $pid || fail=1
Thanks!
I prefer yours, and will push it shortly.
> Subject: [PATCH] tests: avoid spurious failures on older shells
>
> * tests/tail-2/inotify-hash-abuse: Use kill rather than wait
> to determine if the tail process is still running.
> * tests/tail-2/inotify-hash-abuse2: Ditto.
> ---
> tests/tail-2/inotify-hash-abuse | 15 +++------------
> tests/tail-2/inotify-hash-abuse2 | 12 ++----------
> 2 files changed, 5 insertions(+), 22 deletions(-)
>
> diff --git a/tests/tail-2/inotify-hash-abuse b/tests/tail-2/inotify-hash-abuse
> index ab5a69e..65a3412 100755
> --- a/tests/tail-2/inotify-hash-abuse
> +++ b/tests/tail-2/inotify-hash-abuse
> @@ -46,23 +46,14 @@ echo a > 1 || fail=1
>
> # Wait up to 2s for the buggy tail to die,
> # or for the "tail: `1' has appeared; following end of new file" output
> -dead=0
> for i in $(seq 10); do
> - kill -0 $pid || { dead=1; break; }
> + kill -0 $pid || break
> grep 'has appeared;' out > /dev/null && break
> sleep .2
> done
>
> -# Fixed tail will not have aborted. Kill it.
> -test $dead = 0 && kill -HUP $pid
> -
> -wait $pid
> -st=$?
> -
> -case $st in
> - 129) ;;
> - *) echo tail died via unexpected signal: $st; fail=1;;
> -esac
> +# Kill the working tail, or fail if it has already aborted
> +kill $pid || fail=1
>
> cat out
>
> diff --git a/tests/tail-2/inotify-hash-abuse2
> b/tests/tail-2/inotify-hash-abuse2
> index 4fe080b..2e567c7 100755
> --- a/tests/tail-2/inotify-hash-abuse2
> +++ b/tests/tail-2/inotify-hash-abuse2
> @@ -36,15 +36,7 @@ for i in $(seq 200); do
> touch f
> done
>
> -# Fixed tail will not have aborted. Kill it.
> -kill -HUP $pid
> -
> -wait $pid
> -st=$?
> -
> -case $st in
> - 129) ;;
> - *) echo tail died via unexpected signal: $st; fail=1;;
> -esac
> +# Kill the working tail, or fail if it has already aborted
> +kill $pid || fail=1
>
> Exit $fail
Re: coreutils-8.3: a few tests fail, Christophe LYON, 2010/01/14