From a669dfdabb3fa1be2e1367d53a797d495e7bd5c9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 12 Sep 2007 14:52:26 +0200 Subject: More misc, test-related changes. (some to allow running tests as root) --- tests/rm/fail-eacces | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'tests/rm/fail-eacces') diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces index 3293ad550..b15c2f544 100755 --- a/tests/rm/fail-eacces +++ b/tests/rm/fail-eacces @@ -22,22 +22,10 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../lang-default -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 -mkdir d && touch d/f && chmod a-w d || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir d && touch d/f && chmod a-w d || framework_failure fail=0 @@ -46,7 +34,6 @@ cat <<\EOF > exp rm: cannot remove `d/f': Permission denied EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail -- cgit v1.2.3-54-g00ecf