* tests/chgrp/basic: On an OpenBSD system, rather than failing

due to a known problem, merely warn about it.
Rewrite to avoid testing output of chgrp --verbose and chgrp -c.
Instead, use stat to test file system for desired results, directly.
* tests/chgrp/Makefile.am (TESTS_ENVIRONMENT): Set host_triplet.

3 files changed, 75 insertions, 94 deletions

diff --git a/ChangeLog b/ChangeLog
index 475292064..e9bd43078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-09-17  Jim Meyering  <jim@meyering.net>
 
+	* tests/chgrp/basic: On an OpenBSD system, rather than failing
+	due to a known problem, merely warn about it.
+	Rewrite to avoid testing output of chgrp --verbose and chgrp -c.
+	Instead, use stat to test file system for desired results, directly.
+	* tests/chgrp/Makefile.am (TESTS_ENVIRONMENT): Set host_triplet.
+
 	* tests/envvar-check: Add more variable names to the list of those
 	that can affect these programs and tests: _POSIX2_VERSION, COLUMNS,
 	QUOTING_STYLE, TABSIZE, TERM, TMPDIR.
diff --git a/tests/chgrp/Makefile.am b/tests/chgrp/Makefile.am
index ac6dab5a7..2c8de338c 100644
--- a/tests/chgrp/Makefile.am
+++ b/tests/chgrp/Makefile.am
@@ -4,4 +4,5 @@ AUTOMAKE_OPTIONS = 1.4 gnits
 TESTS = no-x posix-H basic deref recurse
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = \
+  host_triplet=$(host_triplet) \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 21cbe01b4..f83f3a185 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -54,99 +54,73 @@ chgrp $g2 f || fail=1
 chgrp $g2 f2 || fail=1
 chgrp -R $g1 d || fail=1
 
-# Don't let verbose output interfere.
-test "$VERBOSE" = yes && set +x
-
-(
-  chgrp -c $g1 f
-  chgrp -c $g2 f
-  chgrp -c $g2 f
-  chgrp --verbose '' f
-  chgrp --verbose $g1 f
-  chgrp --verbose $g1 f
-  chgrp --verbose --reference=f2 f
-  chgrp -R --verbose $g2 d
-  chgrp -R --verbose $g1 d
-  chgrp -R -c $g2 d
-  chgrp -R -c $g1 d
-  chgrp -c $g2 d
-
-  rm -f f
-  touch f
-  ln -s f symlink
-  chgrp $g1 f
-  chgrp -h $g2 symlink
-
-  # This should not change the group of f.
-  chgrp -h -c $g2 symlink
-  chown --from=:$g1 -c :$g2 f
-
-  # This *should* change the group of f.
-  # Though note that the diagnostic is misleading in that
-  # it says the `group of `symlink'' has been changed.
-  chgrp -c $g1 symlink
-  chown --from=:$g1 -c :$g2 f
-
-  # If -R is specified without -H or L, -h is assumed.
-  chgrp -h $g1 f symlink
-  chgrp -R $g2 symlink
-  chown --from=:$g1 -c :$g2 f
-
-  # Make sure we can change the group of inaccessible files.
-  chmod a-r f
-  chown --from=:$g2 -c :$g1 f
-  chmod 0 f
-  chown --from=:$g1 -c :$g2 f
-
-  # chown() must not be optimized away even when
-  # the file's owner and group already have the desired value.
-  rm -f f g
-  touch f g
-  chgrp $g1 f g
-  chgrp $g2 g
-  sleep 1
-  chgrp $g1 f
-
-  # The following no-change chgrp command is supposed to update f's ctime,
-  # but on OpenBSD, it appears to be a no-op for some file system types
-  # (at least NFS) so g's ctime is more recent.  This is not a big deal;
-  # this test works fine when the files are on a local file system (/tmp).
-  chgrp '' f
-  ls -c -t f g
-
-) 2>&1 | sed "
-  s/' to .*[^0-9:].*/' to SOMENAME/
-  s/\([ :]\)$g1$/\1G1/
-  s/\([ :]\)$g2$/\1G2/
-" > actual
-
-cat <<\EOF > expected
-changed group of `f' to G1
-changed group of `f' to G2
-ownership of `f' retained
-changed group of `f' to G1
-group of `f' retained as G1
-changed group of `f' to SOMENAME
-changed group of `d/f3' to G2
-changed group of `d' to G2
-changed group of `d/f3' to G1
-changed group of `d' to G1
-changed group of `d/f3' to G2
-changed group of `d' to G2
-changed group of `d/f3' to G1
-changed group of `d' to G1
-changed group of `d' to G2
-changed ownership of `f' to :G2
-changed group of `symlink' to G1
-changed ownership of `f' to :G2
-changed ownership of `f' to :G2
-changed ownership of `f' to :G1
-changed ownership of `f' to :G2
-f
-g
-EOF
-
-cmp expected actual \
-  || { diff expected actual 1>&2; fail=1; }
+d_files='d d/f3'
+
+chgrp $g1 f || fail=1  ; test `stat --p=%g f` = $g1 || fail=1
+chgrp $g2 f || fail=1  ; test `stat --p=%g f` = $g2 || fail=1
+chgrp $g2 f || fail=1  ; test `stat --p=%g f` = $g2 || fail=1
+chgrp '' f  || fail=1  ; test `stat --p=%g f` = $g2 || fail=1
+chgrp $g1 f || fail=1  ; test `stat --p=%g f` = $g1 || fail=1
+chgrp $g1 f || fail=1  ; test `stat --p=%g f` = $g1 || fail=1
+chgrp --reference=f2 f ; test `stat --p=%g f` = $g2 || fail=1
+
+chgrp -R $g2 d ||fail=1; test `stat --p=%g: $d_files` = "$g2:$g2:" || fail=1
+chgrp -R $g1 d ||fail=1; test `stat --p=%g: $d_files` = "$g1:$g1:" || fail=1
+chgrp -R $g2 d ||fail=1; test `stat --p=%g: $d_files` = "$g2:$g2:" || fail=1
+chgrp -R $g1 d ||fail=1; test `stat --p=%g: $d_files` = "$g1:$g1:" || fail=1
+chgrp $g2 d    ||fail=1; test `stat --p=%g: $d_files` = "$g2:$g1:" || fail=1
+
+rm -f f
+touch f
+ln -s f symlink
+chgrp $g1 f; test `stat --printf=%g f` = $g1 || fail=1
+
+# This should not change the group of f.
+test `stat --printf=%g f` = $g1 || fail=1
+test `stat --printf=%g symlink` = $g1 || fail=1
+chgrp -h $g2 symlink
+test `stat --printf=%g f` = $g1 || fail=1
+test `stat --printf=%g symlink` = $g2 || fail=1
+
+chown --from=:$g1 :$g2 f; test `stat --printf=%g f` = $g2 || fail=1
+
+# This *should* change the group of f.
+# Though note that the diagnostic is misleading in that
+# it says the `group of `symlink'' has been changed.
+chgrp $g1 symlink; test `stat --printf=%g f` = $g1 || fail=1
+chown --from=:$g1 :$g2 f; test `stat --printf=%g f` = $g2 || fail=1
+
+# If -R is specified without -H or L, -h is assumed.
+chgrp -h $g1 f symlink; test `stat --printf=%g symlink` = $g1 || fail=1
+chgrp -R $g2 symlink
+chown --from=:$g1 :$g2 f; test `stat --printf=%g f` = $g2 || fail=1
+
+# Make sure we can change the group of inaccessible files.
+chmod a-r f
+chown --from=:$g2 :$g1 f; test `stat --printf=%g f` = $g1 || fail=1
+chmod 0 f
+chown --from=:$g1 :$g2 f; test `stat --printf=%g f` = $g2 || fail=1
+
+# chown() must not be optimized away even when
+# the file's owner and group already have the desired value.
+rm -f f g
+touch f g
+chgrp $g1 f g
+chgrp $g2 g
+sleep 1
+chgrp $g1 f
+
+# The following no-change chgrp command is supposed to update f's ctime,
+# but on OpenBSD, it appears to be a no-op for some file system types
+# (at least NFS) so g's ctime is more recent.  This is not a big deal;
+# this test works fine when the files are on a local file system (/tmp).
+chgrp '' f
+test "`ls -C -c -t f g`" = 'f  g' || \
+  {
+    case $host_triplet in
+      *openbsd*) echo ignoring known OpenBSD-specific chgrp failure 1>&2  ;;
+      *)         echo no-change chgrp failed to update ctime 1>&2; fail=1 ;;
+    esac
+  }
 
 (exit $fail); exit $fail