diff options
| author | Jim Meyering <jim@meyering.net> | 2007-09-12 14:52:26 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-09-15 08:40:39 +0200 |
| commit | a669dfdabb3fa1be2e1367d53a797d495e7bd5c9 (patch) | |
| tree | c88d6414649f7f4f5571138e193c72da44a03876 /tests/rm/unread3 | |
| parent | 0539705768992ebcc290bc859f64e27898c7f958 (diff) | |
| download | coreutils-a669dfdabb3fa1be2e1367d53a797d495e7bd5c9.tar.xz | |
More misc, test-related changes. (some to allow running tests as root)
Diffstat (limited to 'tests/rm/unread3')
| -rwxr-xr-x | tests/rm/unread3 | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/tests/rm/unread3 b/tests/rm/unread3 index 6fb13d950..71089f5d6 100755 --- a/tests/rm/unread3 +++ b/tests/rm/unread3 @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that rm works even from an unreadable working directory. -# Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2004, 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,28 +21,16 @@ 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 -p a/1 b c d/2 e/3 || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir -p a/1 b c d/2 e/3 || framework_failure fail=0 +t=`pwd` cd c chmod u=x,go= . -t=$pwd/$tmp # With coreutils-5.2.1, this would get a failed assertion. rm -r "$t/a" "$t/b" || fail=1 |