use better trap

diff --git a/tests/cp/same-file b/tests/cp/same-file
index 908fe2e71cc40629b5f6524f92b10f3bdd729c71..09c535c374de7acc0c38c653402ecfb4c6568b17 100755 (executable)
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -15,7 +15,9 @@ VERSION_CONTROL=numbered; export VERSION_CONTROL
 pwd=`pwd`
 actual=actual-$$
 expected=expected-$$
-trap "cd $pwd; rm -rf $actual $expected dir" 0 1 2 3 15
+
+trap 'status=$?; cd $pwd; rm -rf $actual $expected && exit $status' 0
+trap 'exit $?' 1 2 13 15
 
 exec 1> $actual