From c175e3f6c86206b676658c181556fc9b15f25f88 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 20 Apr 2002 14:49:46 +0000 Subject: update framework --- tests/rm/deep-1 | 4 ++-- tests/rm/f-1 | 6 +++--- tests/rm/hash | 6 +++--- tests/rm/i-1 | 6 +++--- tests/rm/ir-1 | 6 +++--- tests/rm/isatty | 6 +++--- tests/rm/r-2 | 6 +++--- tests/rm/r-3 | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/rm/deep-1 b/tests/rm/deep-1 index fc000f2ca..21702ad0e 100755 --- 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 4e72f575c..fef5f90ce 100755 --- 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 505cb9bd2..946776252 100755 --- 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 b0b90ce3a..4bf48e326 100755 --- 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 c127a1cdf..c5d76cde7 100755 --- 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 2026433b1..98df1f87c 100755 --- 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 f4ddeb650..e87e9cf80 100755 --- 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 1a5c07313..7f6c3293e 100755 --- 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). -- cgit v1.2.3-54-g00ecf