X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-file-has-acl.sh;h=9783960823c9fa10b3843cda11ea51ef8ad9f440;hb=07c1f7b3d60a2d8433bddf1a85c33bc2ba4f59ff;hp=bb5568c228c65e82cfd3a7798a90d36e76288bfe;hpb=456355401219fdc2cb203baedd2bf176572e8310;p=gnulib.git

diff --git a/tests/test-file-has-acl.sh b/tests/test-file-has-acl.sh
index bb5568c22..978396082 100755
--- a/tests/test-file-has-acl.sh
+++ b/tests/test-file-has-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
@@ -106,18 +112,6 @@ cd "$builddir" ||
     fi
   fi
 
-  # func_test_has_acl file expected
-  # tests the result of the file_has_acl function on file, and checks that it
-  # matches the expected value.
-  func_test_has_acl ()
-  {
-    res=`"$builddir"/test-file-has-acl${EXEEXT} "$1"`
-    test "$res" = "$2" || {
-      echo "file_has_acl(\"$1\") returned $res, expected $2" 1>&2
-      exit 1
-    }
-  }
-
   # func_test_file_has_acl file expected
   # tests the result of the file_has_acl function on file, and checks that it
   # matches the expected value.
@@ -200,7 +194,7 @@ cd "$builddir" ||
     if test "$agid" = "$mygid"; then agid=2; fi
 
     case $acl_flavor in
-      linux | cygwin | freebsd | solaris)
+      linux | freebsd | solaris)
 
         # Set an ACL for a user.
         if setfacl -m user:$auid:1 tmpfile0; then
@@ -232,6 +226,21 @@ cd "$builddir" ||
         fi
         ;;
 
+      cygwin)
+
+        # Set an ACL for a group.
+        if setfacl -m group:0:1 tmpfile0; then
+
+          func_test_has_acl tmpfile0 yes
+
+          # Remove the ACL for the group.
+          setfacl -d group:0 tmpfile0
+
+          func_test_has_acl tmpfile0 no
+
+        fi
+        ;;
+
       hpux)
 
         # Set an ACL for a user.