update framework

diff --git a/tests/rm/deep-1 b/tests/rm/deep-1
index fc000f2ca759e8bc8691049d6eccd2f0c333cb67..21702ad0e5bb54ec211736f29e12f05a46989944 100755 (executable)
--- a/tests/rm/deep-1
+++ b/tests/rm/deep-1
@@ -13,8 +13,8 @@ if test "$VERBOSE" = yes; then
 fi
 
 pwd=`pwd`
-tmp=`echo "$0"|sed 's,.*/,,'`.tmp
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+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
 
 umask 022

diff --git a/tests/rm/f-1 b/tests/rm/f-1
index 4e72f575c5fe12747ae00b4594d5a9e910d86f04..fef5f90cedd95bed0f0c17675e73843f83c42585 100755 (executable)
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -8,12 +8,12 @@ if test "$VERBOSE" = yes; then
 fi
 
 pwd=`pwd`
-tmp=`echo "$0"|sed 's,.*/,,'`.tmp
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+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
 
 test_failure=0
-mkdir $tmp || test_failure=1
+mkdir -p $tmp || test_failure=1
 
 if test $test_failure = 1; then
   echo 'failure in testing framework'

diff --git a/tests/rm/hash b/tests/rm/hash
index 505cb9bd2401f252b85239f4294f71b341a8d9d1..946776252b9a385f0857943aa1f2db40775f95cc 100755 (executable)
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -11,12 +11,12 @@ if test "$VERBOSE" = yes; then
 fi
 
 pwd=`pwd`
-tmp=hash-$$
-trap 'status=$?; cd $pwd; rm -rf $tmp || exit $?; exit $status' 0
+t0=`echo "$0"|sed 's,.*/,,'`.tmp;tmp=$t0/$$
+trap 'status=$?; cd $pwd; rm -rf $t0 || exit $?; exit $status' 0
 trap 'exit $?' 1 2 13 15
 
 framework_failure=0
-mkdir $tmp || framework_failure=1
+mkdir -p $tmp || framework_failure=1
 cd $tmp
 
 # Create a hierarchy with 3*26 leaf directories, each at depth 153.

diff --git a/tests/rm/i-1 b/tests/rm/i-1
index b0b90ce3a54dc2b7abcf09650fd3c1d3344e9d51..4bf48e32616e59462b19f5be3a327d7df638b6a9 100755 (executable)
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -8,12 +8,12 @@ if test "$VERBOSE" = yes; then
 fi
 
 pwd=`pwd`
-tmp=`echo "$0"|sed 's,.*/,,'`.tmp
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+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
 
 test_failure=0
-mkdir $tmp || test_failure=1
+mkdir -p $tmp || test_failure=1
 echo > $tmp/a || test_failure=1
 test -f $tmp/a || test_failure=1
 

diff --git a/tests/rm/ir-1 b/tests/rm/ir-1
index c127a1cdf2da630fba817efc4cae54f84899f838..c5d76cde75fda5bf3f6b8a26a4de94a2789fe013 100755 (executable)
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -8,12 +8,12 @@ if test "$VERBOSE" = yes; then
 fi
 
 pwd=`pwd`
-tmp=`echo "$0"|sed 's,.*/,,'`.tmp
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+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
 
 test_failure=0
-mkdir $tmp $tmp/a $tmp/b $tmp/c || test_failure=1
+mkdir -p $tmp $tmp/a $tmp/b $tmp/c || test_failure=1
 > $tmp/a/a || test_failure=1
 > $tmp/b/bb || test_failure=1
 > $tmp/c/cc || test_failure=1

diff --git a/tests/rm/isatty b/tests/rm/isatty
index 2026433b1869a5958b3f665a2c494dc68440c3c8..98df1f87cc432ac13a48f26595f0ae633351143c 100755 (executable)
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -9,12 +9,12 @@ fi
 . $srcdir/../lang-default
 
 pwd=`pwd`
-tmp=isatty.$$
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+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 $tmp || framework_failure=1
+mkdir -p $tmp || framework_failure=1
 cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then

diff --git a/tests/rm/r-2 b/tests/rm/r-2
index f4ddeb6500ccc0204d4bf03e28a1cec26c42e174..e87e9cf801cfebcee01a324ced86662f0bfdcad7 100755 (executable)
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -8,12 +8,12 @@ fi
 . $srcdir/../lang-default
 
 pwd=`pwd`
-tmp=r2-$$
-trap 'status=$?; cd $pwd; rm -rf $tmp || exit $?; exit $status' 0
+t0=`echo "$0"|sed 's,.*/,,'`.tmp;tmp=$t0/$$
+trap 'status=$?; cd $pwd; rm -rf $t0 || exit $?; exit $status' 0
 trap 'exit $?' 1 2 13 15
 
 framework_failure=0
-mkdir $tmp || framework_failure=1
+mkdir -p $tmp || framework_failure=1
 cd $tmp
 
 mkdir t t/a t/a/b || framework_failure=1

diff --git a/tests/rm/r-3 b/tests/rm/r-3
index 1a5c073137e28de727b5d5b1613cde91e7ddfaa5..7f6c3293efd6d06a350190084b54d52b1550778d 100755 (executable)
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -9,12 +9,12 @@ if test "$VERBOSE" = yes; then
 fi
 
 pwd=`pwd`
-tmp=`echo "$0"|sed 's,.*/,,'`.tmp
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+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_fail=0
-mkdir $tmp || framework_fail=1
+mkdir -p $tmp || framework_fail=1
 cd $tmp || framework_fail=1
 
 # Create 300 files (12 * 25).