upgrade to use better framework

diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1
index 0d9d462..24246b6 100755 (executable)
--- a/tests/cp/no-deref-link1
+++ b/tests/cp/no-deref-link1
@@ -7,7 +7,20 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-rm -rf a b
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
 mkdir a b
 msg=bar
 echo $msg > a/foo
@@ -26,6 +39,4 @@ test $? = 1 || fail=1
 
 test "`cat a/foo`" = $msg || fail=1
 
-rm -rf a b
-
 (exit $fail); exit

diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2
index 6af843d..7663183 100755 (executable)
--- a/tests/cp/no-deref-link2
+++ b/tests/cp/no-deref-link2
@@ -7,7 +7,20 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-rm -rf a b
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
 mkdir b
 msg=bar
 echo $msg > a
@@ -26,6 +39,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-rm -rf a b
-
 (exit $fail); exit

diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3
index 9ad685f..370803f 100755 (executable)
--- a/tests/cp/no-deref-link3
+++ b/tests/cp/no-deref-link3
@@ -7,7 +7,20 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-rm -rf a b
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
 msg=bar
 echo $msg > a
 ln -s a b
@@ -23,6 +36,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-rm -f a b
-
 (exit $fail); exit