From: Jim Meyering <jim@meyering.net>
Date: Mon, 21 Aug 2000 09:45:52 +0000 (+0000)
Subject: Clean up traps.  Create files in a subdir.
X-Git-Tag: FILEUTILS-4_0z~128
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=3ee1d2075c6eccd9efc48c252544d4cb793e1dce;p=thirdparty%2Fcoreutils.git

Clean up traps.  Create files in a subdir.
---

diff --git a/tests/cp/same-file b/tests/cp/same-file
index 6220b4f310..534875edac 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -13,12 +13,22 @@ LANG=C; export LANG
 VERSION_CONTROL=numbered; export VERSION_CONTROL
 
 pwd=`pwd`
+tmp=same-f-$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo 'failure in testing framework'
+  exit 1
+fi
+
 actual=actual-$$
 expected=expected-$$
 
-trap 'status=$?; cd $pwd; rm -rf dir $actual $expected && exit $status' 0
-trap 'exit $?' 1 2 13 15
-
 exec 1> $actual
 
 # FIXME: This should be bigger: like more than 8k