On Sat, Jan 26, 2008 at 03:36:23PM +0100, Jim Meyering wrote:
> Please see if this makes the test pass:
> 
>       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/tests/cp/preserve-gid b/tests/cp/preserve-gid
> index 5f2c050..9537dc0 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"

The test still fails, but it gets a whole lot further :D


-- Elias
% tar xf coreutils-6.10.tar
% cd coreutils-6.10
% patch -p1 < ~/foo2.patch
patching file tests/cp/preserve-gid
% ./configure --disable-acl >/dev/null
% make -j3 >/dev/null
% sudo env VERBOSE=yes NON_ROOT_USERNAME=$USER make check -C tests/cp 
TESTS=preserve-gid
make  check-TESTS
FAIL: preserve-gid.log

===========================================
 1 of 1 tests failed
 See tests/cp/test-suite.log
 Please report it to bug-coreutils@gnu.org
===========================================

=================================================
   GNU coreutils 6.10: tests/cp/test-suite.log   
=================================================

1 of 1 tests failed.  

.. contents:: :depth: 2


FAIL: preserve-gid.log (exit: 1)
================================

+ cp --version
cp (GNU coreutils) 6.10
Copyright (C) 2008 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering.
++ perl -le 'foreach my $i (1000..16*1024-1) { getpwuid $i or (print $i), exit 
}'
+ nameless_uid=1000
++ perl -le 'foreach my $i (1000..16*1024) { getgrgid $i or (print $i), exit }'
+ nameless_gid1=1000
++ perl -le 'foreach my $i (1000+1..16*1024) { getgrgid $i or (print $i), exit 
}'
+ nameless_gid2=1001
+ test -z 1000
+ test -z 1000
+ test -z 1001
+ chown +1000:+0 .
+ create a0 0 0
+ echo a0
+ chown +0:+0 a0
+ create b0 1000 1000
+ echo b0
+ chown +1000:+1000 b0
+ create b1 1000 1001
+ echo b1
+ chown +1000:+1001 b1
+ create c0 0 1000
+ echo c0
+ chown +0:+1000 c0
+ create c1 0 1001
+ echo c1
+ chown +0:+1001 c1
+ t0 a0 0 0 cp
+ f=a0
+ shift
+ u=0
+ shift
+ g=0
+ shift
+ rm -f b
+ cp a0 b
++ stat -c '%u %g' b
+ s='0 0'
+ test 'x0 0' '!=' 'x0 0'
+ t0 b0 0 0 cp
+ f=b0
+ shift
+ u=0
+ shift
+ g=0
+ shift
+ rm -f b
+ cp b0 b
++ stat -c '%u %g' b
+ s='0 0'
+ test 'x0 0' '!=' 'x0 0'
+ t0 b1 0 0 cp
+ f=b1
+ shift
+ u=0
+ shift
+ g=0
+ shift
+ rm -f b
+ cp b1 b
++ stat -c '%u %g' b
+ s='0 0'
+ test 'x0 0' '!=' 'x0 0'
+ t0 c0 0 0 cp
+ f=c0
+ shift
+ u=0
+ shift
+ g=0
+ shift
+ rm -f b
+ cp c0 b
++ stat -c '%u %g' b
+ s='0 0'
+ test 'x0 0' '!=' 'x0 0'
+ t0 c1 0 0 cp
+ f=c1
+ shift
+ u=0
+ shift
+ g=0
+ shift
+ rm -f b
+ cp c1 b
++ stat -c '%u %g' b
+ s='0 0'
+ test 'x0 0' '!=' 'x0 0'
+ t0 a0 0 0 cp -p
+ f=a0
+ shift
+ u=0
+ shift
+ g=0
+ shift
+ rm -f b
+ cp -p a0 b
++ stat -c '%u %g' b
+ s='0 0'
+ test 'x0 0' '!=' 'x0 0'
+ t0 b0 1000 1000 cp -p
+ f=b0
+ shift
+ u=1000
+ shift
+ g=1000
+ shift
+ rm -f b
+ cp -p b0 b
++ stat -c '%u %g' b
+ s='1000 1000'
+ test 'x1000 1000' '!=' 'x1000 1000'
+ t0 b1 1000 1001 cp -p
+ f=b1
+ shift
+ u=1000
+ shift
+ g=1001
+ shift
+ rm -f b
+ cp -p b1 b
++ stat -c '%u %g' b
+ s='1000 1001'
+ test 'x1000 1001' '!=' 'x1000 1001'
+ t0 c0 0 1000 cp -p
+ f=c0
+ shift
+ u=0
+ shift
+ g=1000
+ shift
+ rm -f b
+ cp -p c0 b
++ stat -c '%u %g' b
+ s='0 1000'
+ test 'x0 1000' '!=' 'x0 1000'
+ t0 c1 0 1001 cp -p
+ f=c1
+ shift
+ u=0
+ shift
+ g=1001
+ shift
+ rm -f b
+ cp -p c1 b
++ stat -c '%u %g' b
+ s='0 1001'
+ test 'x0 1001' '!=' 'x0 1001'
+ t1 a0 1000 1000 cp
+ f=a0
+ shift
+ u=1000
+ shift
+ g=1000
+ shift
+ t0 a0 1000 1000 setuidgid -g 1000,1001 1000 cp
+ f=a0
+ shift
+ u=1000
+ shift
+ g=1000
+ shift
+ rm -f b
+ setuidgid -g 1000,1001 1000 cp a0 b
++ stat -c '%u %g' b
+ s='1000 0'
+ test 'x1000 0' '!=' 'x1000 1000'
+ echo './preserve-gid: setuidgid -g 1000,1001 1000 cp a0 b: 1000 1000 != 1000 
0'
./preserve-gid: setuidgid -g 1000,1001 1000 cp a0 b: 1000 1000 != 1000 0
+ exit 1
+ exit 1
+ st=1
+ cleanup_
+ :
+ d=/Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.Z97dkWMGjs
+ cd /Users/pipping/coreutils-6.10/tests/cp
+ chmod -R u+rwx 
/Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.Z97dkWMGjs
+ rm -rf /Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.Z97dkWMGjs
+ exit 1
make[2]: *** [test-suite.log] Error 1
make[1]: *** [check-TESTS] Error 2
make: *** [check-am] Error 2
%
--- preserve-gid_test_old       2008-01-26 16:48:39 +0100
+++ preserve-gid_test_new       2008-01-26 16:48:43 +0100
@@ -1,5 +1,7 @@
 % tar xf coreutils-6.10.tar
 % cd coreutils-6.10
+% patch -p1 < ~/foo2.patch
+patching file tests/cp/preserve-gid
 % ./configure --disable-acl >/dev/null
 % make -j3 >/dev/null
 % sudo env VERBOSE=yes NON_ROOT_USERNAME=$USER make check -C tests/cp 
TESTS=preserve-gid
@@ -41,7 +43,7 @@
 + test -z 1000
 + test -z 1000
 + test -z 1001
-+ chown +1000 .
++ chown +1000:+0 .
 + create a0 0 0
 + echo a0
 + chown +0:+0 a0
@@ -67,19 +69,146 @@
 + rm -f b
 + cp a0 b
 ++ stat -c '%u %g' b
-+ s='0 20'
-+ test 'x0 20' '!=' 'x0 0'
-+ echo './preserve-gid: cp a0 b: 0 0 != 0 20'
-./preserve-gid: cp a0 b: 0 0 != 0 20
++ s='0 0'
++ test 'x0 0' '!=' 'x0 0'
++ t0 b0 0 0 cp
++ f=b0
++ shift
++ u=0
++ shift
++ g=0
++ shift
++ rm -f b
++ cp b0 b
+++ stat -c '%u %g' b
++ s='0 0'
++ test 'x0 0' '!=' 'x0 0'
++ t0 b1 0 0 cp
++ f=b1
++ shift
++ u=0
++ shift
++ g=0
++ shift
++ rm -f b
++ cp b1 b
+++ stat -c '%u %g' b
++ s='0 0'
++ test 'x0 0' '!=' 'x0 0'
++ t0 c0 0 0 cp
++ f=c0
++ shift
++ u=0
++ shift
++ g=0
++ shift
++ rm -f b
++ cp c0 b
+++ stat -c '%u %g' b
++ s='0 0'
++ test 'x0 0' '!=' 'x0 0'
++ t0 c1 0 0 cp
++ f=c1
++ shift
++ u=0
++ shift
++ g=0
++ shift
++ rm -f b
++ cp c1 b
+++ stat -c '%u %g' b
++ s='0 0'
++ test 'x0 0' '!=' 'x0 0'
++ t0 a0 0 0 cp -p
++ f=a0
++ shift
++ u=0
++ shift
++ g=0
++ shift
++ rm -f b
++ cp -p a0 b
+++ stat -c '%u %g' b
++ s='0 0'
++ test 'x0 0' '!=' 'x0 0'
++ t0 b0 1000 1000 cp -p
++ f=b0
++ shift
++ u=1000
++ shift
++ g=1000
++ shift
++ rm -f b
++ cp -p b0 b
+++ stat -c '%u %g' b
++ s='1000 1000'
++ test 'x1000 1000' '!=' 'x1000 1000'
++ t0 b1 1000 1001 cp -p
++ f=b1
++ shift
++ u=1000
++ shift
++ g=1001
++ shift
++ rm -f b
++ cp -p b1 b
+++ stat -c '%u %g' b
++ s='1000 1001'
++ test 'x1000 1001' '!=' 'x1000 1001'
++ t0 c0 0 1000 cp -p
++ f=c0
++ shift
++ u=0
++ shift
++ g=1000
++ shift
++ rm -f b
++ cp -p c0 b
+++ stat -c '%u %g' b
++ s='0 1000'
++ test 'x0 1000' '!=' 'x0 1000'
++ t0 c1 0 1001 cp -p
++ f=c1
++ shift
++ u=0
++ shift
++ g=1001
++ shift
++ rm -f b
++ cp -p c1 b
+++ stat -c '%u %g' b
++ s='0 1001'
++ test 'x0 1001' '!=' 'x0 1001'
++ t1 a0 1000 1000 cp
++ f=a0
++ shift
++ u=1000
++ shift
++ g=1000
++ shift
++ t0 a0 1000 1000 setuidgid -g 1000,1001 1000 cp
++ f=a0
++ shift
++ u=1000
++ shift
++ g=1000
++ shift
++ rm -f b
++ setuidgid -g 1000,1001 1000 cp a0 b
+++ stat -c '%u %g' b
++ s='1000 0'
++ test 'x1000 0' '!=' 'x1000 1000'
++ echo './preserve-gid: setuidgid -g 1000,1001 1000 cp a0 b: 1000 1000 != 1000 
0'
+./preserve-gid: setuidgid -g 1000,1001 1000 cp a0 b: 1000 1000 != 1000 0
 + exit 1
 + exit 1
 + st=1
 + cleanup_
 + :
-+ d=/Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.vjND9M5Zmn
++ d=/Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.Z97dkWMGjs
 + cd /Users/pipping/coreutils-6.10/tests/cp
-+ chmod -R u+rwx 
/Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.vjND9M5Zmn
-+ rm -rf /Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.vjND9M5Zmn
++ chmod -R u+rwx 
/Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.Z97dkWMGjs
++ rm -rf /Users/pipping/coreutils-6.10/tests/cp/cu-preserve-gid.Z97dkWMGjs
 + exit 1
 make[2]: *** [test-suite.log] Error 1
 make[1]: *** [check-TESTS] Error 2

Attachment: pgpM3xpXdc7B0.pgp
Description: PGP signature

_______________________________________________
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils

Reply via email to