From a669dfdabb3fa1be2e1367d53a797d495e7bd5c9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 12 Sep 2007 14:52:26 +0200
Subject: More misc, test-related changes. (some to allow running tests as
 root)

---
 tests/rm/no-give-up | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'tests/rm/no-give-up')

diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index e112ff705..14d2a4694 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -23,26 +23,14 @@ if test "$VERBOSE" = yes; then
 fi
 
 PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
+. $srcdir/../test-lib.sh
 
-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
-mkdir d || framework_failure=1
-touch d/f || framework_failure=1
-chown -R $NON_ROOT_USERNAME d || framework_failure=1
+mkdir d || framework_failure
+touch d/f || framework_failure
+chown -R $NON_ROOT_USERNAME d || framework_failure
 
 # Ensure that non-root can access files in root-owned ".".
-chmod go=x . || framework_failure=1
-
-if test $framework_failure = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
-fi
+chmod go=x . || framework_failure
 
 fail=0
 
-- 
cgit v1.2.3-70-g09d2