From 3269104d172bdc0c9ed0a01e6706f1f6e1a2bdda Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 3 May 2008 15:43:13 +0200 Subject: tests: move "group-names" into test-lib.sh * tests/group-names: Remove file Move contents into ... * tests/test-lib.sh (require_membership_in_two_groups_): ...here. New function. * tests/chgrp/basic: Use the function, not the file. * tests/chgrp/default-no-deref: Likewise. * tests/chgrp/deref: Likewise. * tests/chgrp/no-x: Likewise. * tests/chgrp/posix-H: Likewise. * tests/chgrp/recurse: Likewise. * tests/cp/existing-perm-race: Likewise. * tests/Makefile.am (EXTRA_DIST): Remove group-names. --- tests/chgrp/basic | 2 +- tests/chgrp/default-no-deref | 2 +- tests/chgrp/deref | 2 +- tests/chgrp/no-x | 2 +- tests/chgrp/posix-H | 2 +- tests/chgrp/recurse | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/chgrp') diff --git a/tests/chgrp/basic b/tests/chgrp/basic index c21aec04f..889a62c9a 100755 --- a/tests/chgrp/basic +++ b/tests/chgrp/basic @@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh +require_membership_in_two_groups_ fail=0 diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref index e1f711d7c..ff484ed00 100755 --- a/tests/chgrp/default-no-deref +++ b/tests/chgrp/default-no-deref @@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh +require_membership_in_two_groups_ set _ $groups; shift g2=$2 diff --git a/tests/chgrp/deref b/tests/chgrp/deref index f3453fb7a..ce70b9d2f 100755 --- a/tests/chgrp/deref +++ b/tests/chgrp/deref @@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh +require_membership_in_two_groups_ set _ $groups; shift g1=$1 diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x index fbe100265..93dd520c3 100755 --- a/tests/chgrp/no-x +++ b/tests/chgrp/no-x @@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh +require_membership_in_two_groups_ skip_if_root_ set _ $groups; shift diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H index 88345767b..0b18b44ce 100755 --- a/tests/chgrp/posix-H +++ b/tests/chgrp/posix-H @@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh +require_membership_in_two_groups_ set _ $groups; shift g1=$1 diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse index 4ae30f969..52b0e1973 100755 --- a/tests/chgrp/recurse +++ b/tests/chgrp/recurse @@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh +require_membership_in_two_groups_ set _ $groups; shift g1=$1 -- cgit v1.2.3-70-g09d2