Mercurial > hg > octave-nkf > gnulib-hg
changeset 11914:e9cf9c46ad7a
Work around deficient /usr/bin/id program on Solaris.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 30 Aug 2009 17:36:32 +0200 |
parents | 4d4630e8627a |
children | 95e2cbebda18 |
files | ChangeLog tests/test-copy-acl.sh tests/test-copy-file.sh tests/test-file-has-acl.sh tests/test-set-mode-acl.sh |
diffstat | 5 files changed, 40 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-08-30 Bruno Haible <bruno@clisp.org> + + Work around deficient /usr/bin/id program on Solaris. + * tests/test-file-has-acl.sh (ID): New variable. + * tests/test-set-mode-acl.sh (ID): Likewise. + * tests/test-copy-acl.sh (ID): Likewise. + * tests/test-copy-file.sh (ID): Likewise. + 2009-08-30 Bruno Haible <bruno@clisp.org> New module 'xstriconveh'.
--- a/tests/test-copy-acl.sh +++ b/tests/test-copy-acl.sh @@ -187,10 +187,16 @@ func_test_copy tmpfile0 tmpfile1 if test $acl_flavor != none; then + # A POSIX compliant 'id' program. + if test -f /usr/xpg4/bin/id; then + ID=/usr/xpg4/bin/id + else + ID=id + fi # Use a user and group id different from the current one, to avoid # redundant/ambiguous ACLs. - myuid=`id -u` - mygid=`id -g` + myuid=`$ID -u` + mygid=`$ID -g` auid=1 if test "$auid" = "$myuid"; then auid=2; fi agid=1
--- a/tests/test-copy-file.sh +++ b/tests/test-copy-file.sh @@ -181,10 +181,16 @@ func_test_copy tmpfile0 tmpfile1 if test "$USE_ACL" != 0 && test $acl_flavor != none; then + # A POSIX compliant 'id' program. + if test -f /usr/xpg4/bin/id; then + ID=/usr/xpg4/bin/id + else + ID=id + fi # Use a user and group id different from the current one, to avoid # redundant/ambiguous ACLs. - myuid=`id -u` - mygid=`id -g` + myuid=`$ID -u` + mygid=`$ID -g` auid=1 if test "$auid" = "$myuid"; then auid=2; fi agid=1
--- a/tests/test-file-has-acl.sh +++ b/tests/test-file-has-acl.sh @@ -187,10 +187,16 @@ func_test_has_acl tmpdir0 no if test $acl_flavor != none; then + # A POSIX compliant 'id' program. + if test -f /usr/xpg4/bin/id; then + ID=/usr/xpg4/bin/id + else + ID=id + fi # Use a user and group id different from the current one, to avoid # redundant/ambiguous ACLs. - myuid=`id -u` - mygid=`id -g` + myuid=`$ID -u` + mygid=`$ID -g` auid=1 if test "$auid" = "$myuid"; then auid=2; fi agid=1
--- a/tests/test-set-mode-acl.sh +++ b/tests/test-set-mode-acl.sh @@ -107,10 +107,16 @@ fi if test $acl_flavor != none; then + # A POSIX compliant 'id' program. + if test -f /usr/xpg4/bin/id; then + ID=/usr/xpg4/bin/id + else + ID=id + fi # Use a user and group id different from the current one, to avoid # redundant/ambiguous ACLs. - myuid=`id -u` - mygid=`id -g` + myuid=`$ID -u` + mygid=`$ID -g` auid=1 if test "$auid" = "$myuid"; then auid=2; fi agid=1