summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xtests/test-file-has-acl.sh2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aaa3397832..11de1e7d2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2023-04-18 Bruno Haible <bruno@clisp.org>
- c32isgraph: Avoid test failure on Cygwin 3.4.6.
+ file-has-acl tests: Avoid test failures on Cygwin 3.4.6.
+ * tests/test-file-has-acl.sh: Fix distinction between Linux setfacl and
+ Cygwin setfacl.
+
+2023-04-18 Bruno Haible <bruno@clisp.org>
+
+ c32isgraph tests: Avoid test failure on Cygwin 3.4.6.
* tests/test-c32isgraph.c (main): Skip U+00A0 test on Cygwin.
2023-04-17 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/tests/test-file-has-acl.sh b/tests/test-file-has-acl.sh
index 9e723b89ba..8703b02e88 100755
--- a/tests/test-file-has-acl.sh
+++ b/tests/test-file-has-acl.sh
@@ -73,7 +73,7 @@ cd "$builddir" ||
# Linux, FreeBSD, Solaris, Cygwin.
if (setfacl --help >/dev/null) 2>/dev/null; then
# Linux, Cygwin.
- if (LC_ALL=C setfacl --help | grep ' --set-file' >/dev/null) 2>/dev/null; then
+ if (LC_ALL=C setfacl --help | grep ' --test' >/dev/null) 2>/dev/null; then
# Linux.
acl_flavor=linux
else