diff options
| author | Pádraig Brady <P@draigBrady.com> | 2013-02-09 04:39:40 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2013-02-10 05:05:38 +0000 |
| commit | 71ab11eac1de965e90abf050bf1bbe22eb4ac7b9 (patch) | |
| tree | 7aec7998c78dda331ae92a0e2341ed5af4ac6751 | |
| parent | 54deb54db989dde759410af9918802961c43bc58 (diff) | |
| download | coreutils-71ab11eac1de965e90abf050bf1bbe22eb4ac7b9.tar.gz coreutils-71ab11eac1de965e90abf050bf1bbe22eb4ac7b9.tar.bz2 coreutils-71ab11eac1de965e90abf050bf1bbe22eb4ac7b9.zip | |
tests: tail-2/inotify-rotate: fix a false failure on NFS
* tests/tail-2/inotify-rotate.sh: Avoid a subshell with bash,
which in turn causes the `kill` to be ineffective to the tail
processes (as the SIGTERM is sent to the subshell which doesn't
propagate the signal on to its children). On NFS the test
cleanup will then fail as there will be .nfs files maintained
in the directory for the files still opened by the tail processes.
Reported by Bernhard Voelker.
| -rwxr-xr-x | tests/tail-2/inotify-rotate.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail-2/inotify-rotate.sh index 94c2b7d7b..4a16202d2 100755 --- a/tests/tail-2/inotify-rotate.sh +++ b/tests/tail-2/inotify-rotate.sh @@ -47,7 +47,8 @@ for i in $(seq 50); do # Normally less than a second is required here, but with heavy load # and a lot of disk activity, even 20 seconds is insufficient, which # leads to this timeout killing tail before the "ok" is written below. - :>k && :>x && timeout 40 tail -F k > out 2>&1 & + :>k && :>x || framework_failure_ failed to initialize files + timeout 40 tail -F k > out 2>&1 & pid=$! sleep .1 echo b > k; @@ -65,4 +66,5 @@ for i in $(seq 50); do test $found = 0 && { cat out; fail_ failed to detect echoed '"ok"'; } done +wait Exit $fail |