Avoid cp/preserve-gid test failure on Mac OS 10.5.1 (Darwin 9.1)

* tests/cp/preserve-gid: Set group as well as owner on ".".
Reported by Elias Pipping.

diff --git a/ChangeLog b/ChangeLog
index 24c621d22db3e2d20f359f7658f3057af8d2ca8c..77f593973b57c9030e668b91e4c6e8f67d572ee2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-26  Jim Meyering  <meyering@redhat.com>
 
+       Avoid cp/preserve-gid test failure on Mac OS 10.5.1 (Darwin 9.1)
+       * tests/cp/preserve-gid: Set group as well as owner on ".".
+       Reported by Elias Pipping.
+
        Improve a warning about non-portable "mv" usage.
        * doc/coreutils.texi (mv invocation): Adjust the warning: moving a
        dir-symlink-specified-with-a-trailing-slash works in a surprising

diff --git a/THANKS b/THANKS
index 9e4e7e03d05a1346d27cbb725fda90ef8dfc9ef6..f9a4f624ae1d5c17fc25dbe11de9d7f8d62a42a9 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -147,6 +147,7 @@ Egmont Koblinger                    egmont@uhulinux.hu
 Eirik Fuller                        eirik@hackrat.com
 Eivind                              eivindt@multinet.no
 Eli Zaretskii                       eliz@is.elta.co.il
+Elias Pipping                       pipping@gentoo.org
 Emile LeBlanc                       leblanc@math.toronto.edu
 Eric Backus                         ericb@lsid.hp.com
 Eric Blake                          ebb9@byu.net

diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid
index 5f2c0502490d839d29c0afd4a1acdd0d5a1302be..9537dc06c4d304bd0aecd635c7b4c77e222a4c1c 100755 (executable)
--- a/tests/cp/preserve-gid
+++ b/tests/cp/preserve-gid
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Verify that cp -p preserves GID when it is possible.
 
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 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
@@ -61,7 +61,7 @@ if test -z "$nameless_uid" \
   skip_test_ "couldn't find a nameless UID or GID"
 fi
 
-chown "+$nameless_uid" .
+chown "+$nameless_uid:+0" .
 
 create a0 0 0
 create b0 "$nameless_uid" "$nameless_gid1"