* tests/mv/hard-link-1: Rearrange to use newer trap-handling code,

	so temporary directories aren't left behind upon e.g., interrupt.

1 files changed, 13 insertions, 5 deletions

diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index 3b077ea4f..6f7d1b7de 100755
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-1
@@ -8,9 +8,20 @@ if test "$VERBOSE" = yes; then
 fi
 
 . $srcdir/setup
+# Make sure we get English translations.
+. $srcdir/../lang-default
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
 
 if test -z "$other_partition_tmpdir"; then
-  exit 77
+  (exit 77); exit 77
 fi
 
 dir=hlink
@@ -22,12 +33,9 @@ ln $dir/a $dir/b || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  exit 1
+  (exit 1); exit 1
 fi
 
-# Make sure we get English translations.
-. $srcdir/../lang-default
-
 mv $dir $other_partition_tmpdir || fail=1
 
 # Display inode numbers, one per line.