Work around Darwin9's set-GID-like group ownership inheritance.

This avoids another spurious Mac OS 10.5.1 (Darwin 9.1) test failure.
* tests/cp/preserve-gid: Accept a group ID of 0, as well.
Reported by Elias Pipping.

diff --git a/ChangeLog b/ChangeLog
index 50a53e6036df17a9388d0d9dfe606806d8489301..f89f684801d715e74b0bf26c317f05c520953c2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-26  Jim Meyering  <meyering@redhat.com>
 
+       Work around Darwin9's set-GID-like group ownership inheritance.
+       This avoids another spurious Mac OS 10.5.1 (Darwin 9.1) test failure.
+       * tests/cp/preserve-gid: Accept a group ID of 0, as well.
+       Reported by Elias Pipping.
+
        Emit "info coreutils 'PROG invocation'" into the man page,
        rather than just "info PROG".  The latter would often fail
        or simply display the man page.

diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid
index 9537dc06c4d304bd0aecd635c7b4c77e222a4c1c..516733f33ff8a1a9995561ea34ac328b5d8cbfac 100755 (executable)
--- a/tests/cp/preserve-gid
+++ b/tests/cp/preserve-gid
@@ -33,8 +33,14 @@ t0() {
   "$@" "$f" b || exit 1
   s=`stat -c '%u %g' b`
   if test "x$s" != "x$u $g"; then
-    echo "$0: $* $f b: $u $g != $s" 1>&2
-    (exit 1); exit 1
+    # Allow the actual group to match that of the parent directory
+    # (it was set to 0 above).
+    if test "x$s" = "x$u 0"; then
+      :
+    else
+      echo "$0: $* $f b: $u $g != $s" 1>&2
+      (exit 1); exit 1
+    fi
   fi
 }