diff options
Diffstat (limited to 'tests/chown/preserve-root')
| -rwxr-xr-x | tests/chown/preserve-root | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root index 6889fa579..de45cbc16 100755 --- a/tests/chown/preserve-root +++ b/tests/chown/preserve-root @@ -1,7 +1,7 @@ #!/bin/sh # Verify that --preserve-root works. -# 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,25 +21,12 @@ if test "$VERBOSE" = yes; then chown --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default PRIV_CHECK_ARG=require-non-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 && ln -s / d/slink-to-root -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi - fail=0 # Even if --preserve-root were to malfunction, allowing the chown or @@ -80,7 +67,6 @@ chgrp: it is dangerous to operate recursively on `d/slink-to-root' (same as `/') chgrp: use --no-preserve-root to override this failsafe EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |