From: Jim Meyering <jim@meyering.net>
Date: Sat, 20 May 2000 08:48:39 +0000 (+0000)
Subject: fail if final rm fails
X-Git-Tag: FILEUTILS-4_0s~22
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=619ffb2bff2e87d077562d024dfd10a202fda885;p=thirdparty%2Fcoreutils.git

fail if final rm fails
---

diff --git a/tests/rm/hash b/tests/rm/hash
index d57cf4d4b3..17587b1822 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -10,7 +10,7 @@ fi
 
 pwd=`pwd`
 tmp=hash-$$
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'status=$?; cd $pwd; rm -rf $tmp || exit $?; exit $status' 0
 trap 'exit $?' 1 2 13 15
 
 framework_failure=0
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index e33a69d7c2..596581cd32 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -7,7 +7,7 @@ fi
 
 pwd=`pwd`
 tmp=r2-$$
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'status=$?; cd $pwd; rm -rf $tmp || exit $?; exit $status' 0
 trap 'exit $?' 1 2 13 15
 
 framework_failure=0