From: Michael Albinus Date: Sun, 19 Nov 2017 11:11:18 +0000 (+0100) Subject: Further fix for Bug#29291 X-Git-Tag: emacs-26.0.91~286 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8892b4e627087cdceef39a96e100cf18c9391ae;p=emacs.git Further fix for Bug#29291 * test/lisp/net/tramp-tests.el (tramp-test24-file-acl): Check for local ACL support. (Bug#29291) --- diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 62f72a3f6f6..3d0ed499d54 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)