fail if final rm fails

diff --git a/tests/rm/hash b/tests/rm/hash
index d57cf4d4b3722dadd113455906e8137d25b833bf..17587b1822c2d173d7dce81922a6cd3d9cc119b6 100755 (executable)
--- 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 e33a69d7c2592eb29c12c79fb2b8e0443d269e0b..596581cd3253a79cf225981b60b88db7df49c581 100755 (executable)
--- 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