]> git.eshelyaron.com Git - emacs.git/commitdiff
Further fix for Bug#29291
authorMichael Albinus <michael.albinus@gmx.de>
Sun, 19 Nov 2017 11:11:18 +0000 (12:11 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sun, 19 Nov 2017 11:11:18 +0000 (12:11 +0100)
* test/lisp/net/tramp-tests.el (tramp-test24-file-acl):
Check for local ACL support.  (Bug#29291)

test/lisp/net/tramp-tests.el

index 62f72a3f6f665ece23ac6c8314c07cbdb2fbe854..3d0ed499d541638f7c807dca91538fe7eb440e51 100644 (file)
@@ -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)