From: Jim Meyering <jim@meyering.net>
Date: Sat, 30 Sep 2000 08:32:55 +0000 (+0000)
Subject: Update to use newer template.
X-Git-Tag: TEXTUTILS-2_0_8~99
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d7232f8ca7fec756ad32cce7d771d41f4bede42f;p=thirdparty%2Fcoreutils.git

Update to use newer template.
---

diff --git a/tests/du/two-args b/tests/du/two-args
index 6de6d0fe85..27c78968e5 100755
--- a/tests/du/two-args
+++ b/tests/du/two-args
@@ -7,9 +7,19 @@ if test "$VERBOSE" = yes; then
   du --version
 fi
 
+pwd=`pwd`
 tmp=du2-$$
-trap 'status=$?; rm -rf $tmp && exit $status' 0
-trap 'exit $?' 1 2 13 15
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap '(exit $?); 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); exit
+fi
 
 mkdir -p $tmp/1 $tmp/2
 
@@ -21,4 +31,4 @@ du $tmp/1 $tmp/2 > /dev/null || fail=1
 du . $tmp > /dev/null || fail=1
 du .. $tmp > /dev/null || fail=1
 
-exit $fail
+(exit $fail); exit