diff options
Diffstat (limited to 'tests/rm/empty-inacc')
| -rwxr-xr-x | tests/rm/empty-inacc | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc index a92b52849..32772e755 100755 --- a/tests/rm/empty-inacc +++ b/tests/rm/empty-inacc @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that rm -rf removes an empty-and-inaccessible directory. -# 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,27 +21,15 @@ 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 -mkdir -m0 inacc || framework_failure=1 +mkdir -m0 inacc || framework_failure # Also exercise the different code path that's taken for a directory # that is empty (hence removable) and unreadable. mkdir -m a-r -p a/unreadable -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi - fail=0 # This would fail for e.g., coreutils-5.93. |