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 a5bfee6033e7341d3897e352803e197fda43da3c..3116dd165ccc13602d8736145f8434e54df05850 100755 (executable)
--- 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 07741ddcf76d0559c1c3a0e492a66ce9171f0a8e..8c5bed468794997f201774133df42037682fb2ce 100755 (executable)
--- 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 c2b0cf7b434c02c10b0230c2e2c05e622cd85186..239ecebcb9c3708832ca2af7ad58452be4221692 100755 (executable)
--- 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 1baadc66b6a000743310576a321c7443dbf57349..77f62fa6b91af704ecd89d06939caf8bd0030e79 100755 (executable)
--- 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 c11accbbf5746ee558e2c91ccca0a1044d6d8bec..7c693cf16b0d1cb3b703397bb7fc200ac07b4250 100755 (executable)
--- 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 8874e64ca001387d7488463f355c2f61310a18ed..99181e5b987cd00747e8be4521f8abe4c499ea99 100755 (executable)
--- 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 a2c76f63715870ab0c4293c11ff28a84c7c99f93..b602f2f178ec90c4094f2ebdd7dea733b013760c 100755 (executable)
--- 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 2694d6b345a02b54da03db83341ccdd904340235..4c2abe0353d8a54e4c82da23d8a10e66c43bc026 100755 (executable)
--- 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 c141ed18bb510cc120129c704e3f070426df3769..9ac6bd0d692730af2d7e08eaf2cb8d25200f78fb 100755 (executable)
--- 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 b6f745084c051231baffc3983cfb27242081d3bf..468b0c98330ba09c7d0e080073ab08030a4d3a94 100755 (executable)
--- 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 463485f68c6ccb6916c98ffb27c409d977b13452..0ca8bb92a41e1c4cf6a6615296b8507c2d4d5e6a 100755 (executable)
--- 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 663b9da4ec20484411465862b9fc6e8b19d9b5a4..be8d2acea1b2f625ee26b42b8e1415c148c7427a 100755 (executable)
--- 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 79e355e6d82e7b75794c6421c81ddcc6ab012e21..bb1dda6d658c0cd6189ee0f002dfed47e9552815 100755 (executable)
--- 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 3a85c4994ed7dc175241e2e1f2bce456756999a2..0d9d462fc8d6ba4e1bb91f9c2a2d8076ab49bad5 100755 (executable)
--- 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 963e5af221af47b9e6f9e773f848fca7f4032c87..6af843d006021eeb61dd4de39b2ac57ae5818c0e 100755 (executable)
--- 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 41910e1a343635a4625362e11c498760ac98597f..9ad685f7a8466f038fdd65390c46a05e3b861512 100755 (executable)
--- 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 da238bec072156fefaf6f8760034a096e3823e95..cb295c17e801bd8a29febff5a4bcc77a596d9bf3 100755 (executable)
--- 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 472ee5c785de4dc5345827d104f8a3073c376e82..a06409ff2776d1d686320eabf1c39eaa87def09f 100755 (executable)
--- 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 7ae7ec0bca5e892ea78868172d42f8ee260f19fd..e9fbb307d8aa50936cc31329c9b602ab96dcf177 100755 (executable)
--- 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 90a3f6f2d876b62a6df0ee035168a51a15d1c293..837edd512f50f11d54416707ef8583bd3d258504 100755 (executable)
--- 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 231ba0037d32c651d297657dae6e65cf20bddd79..5b31fda0d20abb63040a9c7660ebb669ddb45bc6 100755 (executable)
--- 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 7fb0c0717a5cabcceaf7d019d5b490f1fd66d146..827888c68405de8f62ea46efaa2cb536cbb6d80d 100755 (executable)
--- 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