X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-copy-acl.sh;h=a16990b217292cbd00f961cfcc4e87bd7eedfb15;hb=d1aa3e40286ed2b0ad1045b326a37167ac5d8847;hp=6d59702681362eebd76a70af694762b277a81636;hpb=ee9cc09504e83403c347b501d8fb0f2589ea1037;p=gnulib.git

diff --git a/tests/test-copy-acl.sh b/tests/test-copy-acl.sh
index 6d5970268..a16990b21 100755
--- a/tests/test-copy-acl.sh
+++ b/tests/test-copy-acl.sh
@@ -3,6 +3,12 @@
 # Show all commands when run with environment variable VERBOSE=yes.
 test -z "$VERBOSE" || set -x
 
+test "$USE_ACL" = 0 &&
+  {
+    echo "Skipping test: insufficient ACL support"
+    exit 77
+  }
+
 # func_tmpdir
 # creates a temporary directory.
 # Sets variable
@@ -181,10 +187,16 @@ cd "$builddir" ||
   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