From: Jim Meyering Date: Fri, 19 Apr 2002 21:55:30 +0000 (+0000) Subject: Lots of clean-up: X-Git-Tag: SH-UTILS-2_0_12~106 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=306c8e8b4fec79a581f2cad7b160ba6f61f600ac;p=thirdparty%2Fcoreutils.git Lots of clean-up: E.g., (exit $fail); exit t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ trap 'status=$?; cd $pwd; rm -rf $t0 && exit $status' 0 --- diff --git a/tests/cp/backup-1 b/tests/cp/backup-1 index a5bfee6033..3116dd165c 100755 --- a/tests/cp/backup-1 +++ b/tests/cp/backup-1 @@ -6,8 +6,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 framework_failure=0 diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src index 07741ddcf7..8c5bed4687 100755 --- a/tests/cp/backup-is-src +++ b/tests/cp/backup-is-src @@ -31,4 +31,4 @@ cmp out2 exp || fail=1 rm -f out out2 exp a a~ -exit $fail +(exit $fail); exit diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL index c2b0cf7b43..239ecebcb9 100755 --- a/tests/cp/cp-HL +++ b/tests/cp/cp-HL @@ -9,12 +9,12 @@ fi . $srcdir/../envvar-check pwd=`pwd` -tmp=cp-HL.$$ -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 $?' 1 2 13 15 framework_failure=0 -mkdir $tmp || framework_failure=1 +mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 mkdir src-dir dest-dir || framework_failure=1 diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index 1baadc66b6..77f62fa6b9 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -88,4 +88,4 @@ cmp $expected $actual || fail=1 # Uncomment this if you see a failure and want to try to diagnose it. test $fail = 1 && diff -c $expected $actual 1>&2 -exit $fail +(exit $fail); exit diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents index c11accbbf5..7c693cf16b 100755 --- a/tests/cp/cp-parents +++ b/tests/cp/cp-parents @@ -10,8 +10,8 @@ fi umask 022 pwd=`pwd` -tmp=cp-parents.$$ -trap 'status=$?; cd $pwd; exec 1>&2; rm -rf $tmp && exit $status' 0 +t0=`echo "$0"|sed 's,.*/,,'`.tmp;tmp=$t0/$$ +trap 'status=$?; cd $pwd; exec 1>&2; rm -rf $t0 && exit $status' 0 trap '(exit $?); exit' 1 2 13 15 framework_failure=0 @@ -23,7 +23,7 @@ cd $pwd || framework_failure=1 . $srcdir/../envvar-check -mkdir $tmp || framework_failure=1 +mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 . $abs_srcdir/../setgid-check diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink index 8874e64ca0..99181e5b98 100755 --- a/tests/cp/deref-slink +++ b/tests/cp/deref-slink @@ -11,12 +11,12 @@ fi . $srcdir/../lang-default pwd=`pwd` -tmp=FIXME.$$ -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 touch f slink-target || framework_failure=1 ln -s slink-target slink || framework_failure=1 diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest index a2c76f6371..b602f2f178 100755 --- a/tests/cp/dir-rm-dest +++ b/tests/cp/dir-rm-dest @@ -7,12 +7,12 @@ if test "$VERBOSE" = yes; then fi pwd=`pwd` -tmp=cprmdest.$$ -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 mkdir d e || framework_failure=1 diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash index 2694d6b345..4c2abe0353 100755 --- a/tests/cp/dir-slash +++ b/tests/cp/dir-slash @@ -8,12 +8,12 @@ if test "$VERBOSE" = yes; then fi pwd=`pwd` -tmp=t-cpdirsl.$$ -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 || framework_failure=1 mkdir dir1 dir2 || framework_failure=1 @@ -35,4 +35,4 @@ test -r dir2/dir1/file || fail=1 test -r dir1/file || fail=1 (exit $fail) -exit $fail +(exit $fail); exit diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file index c141ed18bb..9ac6bd0d69 100755 --- a/tests/cp/dir-vs-file +++ b/tests/cp/dir-vs-file @@ -9,12 +9,12 @@ fi . $srcdir/../envvar-check pwd=`pwd` -tmp=dirvfile.$$ -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 mkdir dir || framework_failure=1 diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm index b6f745084c..468b0c9833 100755 --- a/tests/cp/fail-perm +++ b/tests/cp/fail-perm @@ -6,12 +6,12 @@ if test "$VERBOSE" = yes; then fi pwd=`pwd` -tmp=fail-perm.$$ -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 $?' 1 2 13 15 framework_failure=0 -mkdir $tmp || framework_failure=1 +mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 mkdir D || framework_failure=1 diff --git a/tests/cp/into-self b/tests/cp/into-self index 463485f68c..0ca8bb92a4 100755 --- a/tests/cp/into-self +++ b/tests/cp/into-self @@ -14,12 +14,12 @@ fi . $srcdir/../lang-default pwd=`pwd` -tmp=into-self.$$ -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 mkdir dir || framework_failure=1 diff --git a/tests/cp/link b/tests/cp/link index 663b9da4ec..be8d2acea1 100755 --- a/tests/cp/link +++ b/tests/cp/link @@ -8,12 +8,12 @@ if test "$VERBOSE" = yes; then fi pwd=`pwd` -tmp=cp-link.$$ -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 touch src || framework_failure=1 diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve index 79e355e6d8..bb1dda6d65 100755 --- a/tests/cp/link-preserve +++ b/tests/cp/link-preserve @@ -11,12 +11,12 @@ fi . $srcdir/../lang-default pwd=`pwd` -tmp=lp.$$ -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 touch a || framework_failure=1 ln a b || framework_failure=1 diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1 index 3a85c4994e..0d9d462fc8 100755 --- a/tests/cp/no-deref-link1 +++ b/tests/cp/no-deref-link1 @@ -28,4 +28,4 @@ test "`cat a/foo`" = $msg || fail=1 rm -rf a b -exit $fail +(exit $fail); exit diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2 index 963e5af221..6af843d006 100755 --- a/tests/cp/no-deref-link2 +++ b/tests/cp/no-deref-link2 @@ -28,4 +28,4 @@ test "`cat a`" = $msg || fail=1 rm -rf a b -exit $fail +(exit $fail); exit diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3 index 41910e1a34..9ad685f7a8 100755 --- a/tests/cp/no-deref-link3 +++ b/tests/cp/no-deref-link3 @@ -25,4 +25,4 @@ test "`cat a`" = $msg || fail=1 rm -f a b -exit $fail +(exit $fail); exit diff --git a/tests/cp/perm b/tests/cp/perm index da238bec07..cb295c17e8 100755 --- a/tests/cp/perm +++ b/tests/cp/perm @@ -12,12 +12,12 @@ fi . $srcdir/../envvar-check pwd=`pwd` -tmp=perm.$$ -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 umask 037 diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink index 472ee5c785..a06409ff27 100755 --- a/tests/cp/r-vs-symlink +++ b/tests/cp/r-vs-symlink @@ -12,12 +12,12 @@ fi . $srcdir/../envvar-check pwd=`pwd` -tmp=r-vs-slink.$$ -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 echo abc > foo || framework_failure=1 ln -s foo slink || framework_failure=1 diff --git a/tests/cp/same-file b/tests/cp/same-file index 7ae7ec0bca..e9fbb307d8 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -12,12 +12,12 @@ fi VERSION_CONTROL=numbered; export VERSION_CONTROL pwd=`pwd` -tmp=same-f-$$ -trap 'status=$?; cd $pwd; exec 1>&2; rm -rf $tmp && exit $status' 0 +t0=`echo "$0"|sed 's,.*/,,'`.tmp;tmp=$t0/$$ +trap 'status=$?; cd $pwd; exec 1>&2; rm -rf $t0 && 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 || framework_failure=1 if test $framework_failure = 1; then diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink index 90a3f6f2d8..837edd512f 100755 --- a/tests/cp/slink-2-slink +++ b/tests/cp/slink-2-slink @@ -13,12 +13,12 @@ fi . $srcdir/../lang-default pwd=`pwd` -tmp=sl2sl-$$ -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 $?' 1 2 13 15 framework_failure=0 -mkdir $tmp || framework_failure=1 +mkdir -p $tmp || framework_failure=1 cd $tmp touch file || framework_failure=1 @@ -36,4 +36,4 @@ fail=0 cp --update --no-dereference a b || fail=1 cp --update --no-dereference c d || fail=1 -exit $fail +(exit $fail); exit diff --git a/tests/cp/special-bits b/tests/cp/special-bits index 231ba0037d..5b31fda0d2 100755 --- a/tests/cp/special-bits +++ b/tests/cp/special-bits @@ -13,12 +13,12 @@ fi PRIV_CHECK_ARG=require-root . $srcdir/../priv-check pwd=`pwd` -tmp=spec-bits.$$ -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 touch a b || framework_failure=1 diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash index 7fb0c0717a..827888c684 100755 --- a/tests/cp/symlink-slash +++ b/tests/cp/symlink-slash @@ -9,10 +9,13 @@ fi . $srcdir/../lang-default -tmp=t-cpsymsl.$$ +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 $tmp || framework_failure=1 +mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 mkdir dir || framework_failure=1 @@ -34,7 +37,4 @@ set `ls -l s` # call and so cp ends up dereferencing the symlink and copying the directory. test "$*" = 'total 0' && : || fail=1 -cd .. -rm -rf $tmp - -exit $fail +(exit $fail); exit