diff options
Diffstat (limited to 'tests/chgrp')
| -rw-r--r-- | tests/chgrp/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/chgrp/basic | 16 | ||||
| -rwxr-xr-x | tests/chgrp/default-no-deref | 19 | ||||
| -rwxr-xr-x | tests/chgrp/deref | 17 | ||||
| -rwxr-xr-x | tests/chgrp/no-x | 28 | ||||
| -rwxr-xr-x | tests/chgrp/posix-H | 28 | ||||
| -rwxr-xr-x | tests/chgrp/recurse | 17 |
7 files changed, 27 insertions, 100 deletions
diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am index 8dffd0157..8fc5f6876 100644 --- a/tests/chgrp/Makefile.am +++ b/tests/chgrp/Makefile.am @@ -12,3 +12,5 @@ TESTS_ENVIRONMENT = \ host_triplet=$(host_triplet) \ CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \ PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" + +include $(top_srcdir)/tests/check.mk diff --git a/tests/chgrp/basic b/tests/chgrp/basic index e970cac5d..8a795d63b 100755 --- a/tests/chgrp/basic +++ b/tests/chgrp/basic @@ -21,23 +21,9 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default . $srcdir/../group-names - -pwd=`pwd` -tmp=basic.$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' 1>&2 - (exit 1); exit 1 -fi +. $srcdir/../test-lib.sh fail=0 diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref index 73137ff95..e7239d52d 100755 --- a/tests/chgrp/default-no-deref +++ b/tests/chgrp/default-no-deref @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that chgrp -R does not dereference symlinks. -# 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 @@ -22,23 +22,12 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../group-names +. $srcdir/../test-lib.sh + set _ $groups; shift g2=$2 -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 f && ln -s ../f d/s || 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 f && ln -s ../f d/s || framework_failure fail=0 diff --git a/tests/chgrp/deref b/tests/chgrp/deref index b40dd5a45..5dd61e105 100755 --- a/tests/chgrp/deref +++ b/tests/chgrp/deref @@ -1,7 +1,7 @@ #!/bin/sh # see if chgrp can change the group of a symlink -# Copyright (C) 2000, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2004-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 @@ -22,20 +22,7 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../group-names - -pwd=`pwd` -tmp=slink.$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' 1>&2 - (exit 1); exit 1 -fi +. $srcdir/../test-lib.sh set _ $groups; shift g1=$1 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 diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H index 1e715dc08..a9b41d011 100755 --- a/tests/chgrp/posix-H +++ b/tests/chgrp/posix-H @@ -1,7 +1,7 @@ #!/bin/sh # Test POSIX-mandated -H option. -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003-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 @@ -22,29 +22,17 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../group-names +. $srcdir/../test-lib.sh + set _ $groups; shift g1=$1 g2=$2 -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 1 2 3 || framework_failure=1 -touch 1/1F 2/2F 3/3F || framework_failure=1 -ln -s 1 1s || framework_failure=1 -ln -s ../3 2/2s || framework_failure=1 -chgrp -R $g1 1 2 3 || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir 1 2 3 || framework_failure +touch 1/1F 2/2F 3/3F || framework_failure +ln -s 1 1s || framework_failure +ln -s ../3 2/2s || framework_failure +chgrp -R $g1 1 2 3 || framework_failure fail=0 diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse index b06f1a001..a0cacd645 100755 --- a/tests/chgrp/recurse +++ b/tests/chgrp/recurse @@ -1,7 +1,7 @@ #!/bin/sh # ad-hoc tests of chgrp with -R and -H or -L and symlinks -# Copyright (C) 2000, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2003-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 @@ -22,20 +22,7 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../group-names - -pwd=`pwd` -tmp=recurse.$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' 1>&2 - (exit 1); exit 1 -fi +. $srcdir/../test-lib.sh set _ $groups; shift g1=$1 |