diff options
Diffstat (limited to 'tests/chgrp/no-x')
| -rwxr-xr-x | tests/chgrp/no-x | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x index 58ac089c7..a98ba90ef 100755 --- a/tests/chgrp/no-x +++ b/tests/chgrp/no-x @@ -22,29 +22,18 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $srcdir/../group-names -set _ $groups; shift -g1=$1 -g2=$2 - . $srcdir/../lang-default +. $srcdir/../group-names PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check -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 +. $srcdir/../test-lib.sh -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -mkdir -p d/no-x/y || framework_failure=1 -chmod u=rw d/no-x || framework_failure=1 +set _ $groups; shift +g1=$1 +g2=$2 -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir -p d/no-x/y || framework_failure +chmod u=rw d/no-x || framework_failure fail=0 @@ -67,7 +56,6 @@ cat <<EOF > exp $prog: \`d/no-x': 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 |