summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-11-19 12:11:18 +0100
committerMichael Albinus <michael.albinus@gmx.de>2017-11-19 12:11:18 +0100
commita8892b4e627087cdceef39a96e100cf18c9391ae (patch)
tree6e158392473b881b631f936d8659262870d61b79 /test
parentd14923b4d48410e37efc85b25cbe75e07c8f8ac7 (diff)
Further fix for Bug#29291
* test/lisp/net/tramp-tests.el (tramp-test24-file-acl): Check for local ACL support. (Bug#29291)
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el8
1 files changed, 5 insertions, 3 deletions
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)