From b6ef652e50f49e55871c5d08c43ee250950f1cbb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 3 Dec 2010 11:08:48 -0800 Subject: tests: cleanup rm -rf fails under NFS This problem was observed on RHEL 5.5 x86-64 when running as a client of a NetApp FAS2050. * tests/cp/cp-mv-backup: Don't leave a file descriptor open to a file in a directory that will be cleaned up with "rm -rf". Under NFS, when the rm unlinks that file, it is instead renamed to .nfsXXXX and then rm cannot remove the parent directory, and the test fails. * tests/cp/same-file: Likewise. --- tests/cp/cp-mv-backup | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/cp/cp-mv-backup') diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index d77568575..a1b2efeb0 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -28,7 +28,7 @@ umask 022 actual=actual expected=expected -exec 1> $actual +exec 3>&1 1> $actual for prog in cp mv; do for initial_files in 'x' 'x y' 'x y y~' 'x y y.~1~' 'x y y~ y.~1~'; do @@ -85,6 +85,8 @@ EOF sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected +exec 1>&3 3>&- + compare $expected $actual || fail=1 Exit $fail -- cgit v1.2.3-70-g09d2