From: Jim Meyering <meyering@redhat.com>
Date: Sat, 26 Jan 2008 14:38:39 +0000 (+0100)
Subject: Avoid cp/preserve-gid test failure on Mac OS 10.5.1 (Darwin 9.1)
X-Git-Tag: v6.11~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c9c9845e9458ca9cc07af3b06326685a1684a7;p=thirdparty%2Fcoreutils.git

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 24c621d22d..77f593973b 100644
--- 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 9e4e7e03d0..f9a4f624ae 100644
--- 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 5f2c050249..9537dc06c4 100755
--- 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"