From: Bruno Haible Date: Mon, 9 Jun 2025 10:51:14 +0000 (+0200) Subject: file-has-acl tests: Avoid test failure on Cygwin. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c731f33152bb03536c097f82002377670f6832c8;p=thirdparty%2Fgnulib.git file-has-acl tests: Avoid test failure on Cygwin. * modules/file-has-acl-tests (Makefile.am): Add host_os to the TESTS_ENVIRONMENT. * tests/test-file-has-acl-2.sh: On Cygwin, skip this test. --- diff --git a/ChangeLog b/ChangeLog index c0eed85a66..bae0566e0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-06-09 Bruno Haible + + file-has-acl tests: Avoid test failure on Cygwin. + * modules/file-has-acl-tests (Makefile.am): Add host_os to the + TESTS_ENVIRONMENT. + * tests/test-file-has-acl-2.sh: On Cygwin, skip this test. + 2025-06-08 Paul Eggert parse-datetime: debug mktime failures better diff --git a/modules/file-has-acl-tests b/modules/file-has-acl-tests index f34d8733f9..0824388a5a 100644 --- a/modules/file-has-acl-tests +++ b/modules/file-has-acl-tests @@ -15,6 +15,8 @@ AC_CHECK_DECLS_ONCE([alarm]) Makefile.am: TESTS += \ test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh -TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) +TESTS_ENVIRONMENT += \ + USE_ACL=$(USE_ACL) \ + host_os='@host_os@' check_PROGRAMS += test-file-has-acl test_file_has_acl_LDADD = $(LDADD) $(FILE_HAS_ACL_LIB) diff --git a/tests/test-file-has-acl-2.sh b/tests/test-file-has-acl-2.sh index 41561d6cf3..a268f4e5d4 100755 --- a/tests/test-file-has-acl-2.sh +++ b/tests/test-file-has-acl-2.sh @@ -5,6 +5,12 @@ . "${srcdir=.}/init.sh"; path_prepend_ . +# Around 2025-06-06, this test started failing on the GitHub CI machines. +# Cause unknown. +case "$host_os" in + cygwin*) Exit 77 ;; +esac + TMPDIR=`pwd` export TMPDIR