summaryrefslogtreecommitdiff
path: root/tests/rm/no-give-up
diff options
context:
space:
mode:
Diffstat (limited to 'tests/rm/no-give-up')
-rwxr-xr-xtests/rm/no-give-up22
1 files changed, 5 insertions, 17 deletions
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