summaryrefslogtreecommitdiff
path: root/tests/rm/ignorable
diff options
context:
space:
mode:
Diffstat (limited to 'tests/rm/ignorable')
-rwxr-xr-xtests/rm/ignorable20
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/rm/ignorable b/tests/rm/ignorable
index 142af2f94..a3fe1dcaf 100755
--- a/tests/rm/ignorable
+++ b/tests/rm/ignorable
@@ -1,7 +1,7 @@
#!/bin/sh
# Ensure that rm -f existing-non-dir/anything exits successfully
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,22 +21,10 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+. $srcdir/../test-lib.sh
+skip_if_root_
-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
-touch existing-non-dir || framework_failure=1
-
-if test $framework_failure = 1; then
- echo "$0: failure in testing framework" 1>&2
- (exit 1); exit 1
-fi
+touch existing-non-dir || framework_failure
fail=0