[Emacs-diffs] emacs-26 a8892b4: Further fix for Bug#29291

[Michael Albinus]

branch: emacs-26
commit a8892b4e627087cdceef39a96e100cf18c9391ae
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Further fix for Bug#29291
    
    * test/lisp/net/tramp-tests.el (tramp-test24-file-acl):
    Check for local ACL support.  (Bug#29291)
---
 test/lisp/net/tramp-tests.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 62f72a3..3d0ed49 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2983,9 +2983,11 @@ This tests also `make-symbolic-link', `file-truename' 
and `add-name-to-file'."
            (set-file-modes tmp-name3 #o444)
            (should-not
             (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
-           ;; Copy ACL.
-           (set-file-acl tmp-name3 (file-acl tmp-name1))
-           (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
+           ;; Copy ACL.  Since we don't know whether Emacs is built
+           ;; with local ACL support, we must check it.
+           (when (set-file-acl tmp-name3 (file-acl tmp-name1))
+               (file-acl tmp-name1) (file-acl tmp-name3))
+             (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
 
            ;; Two files with same ACLs.
            (delete-file tmp-name1)