[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6d3cb26: Use also truname of temporary-file-directo
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 6d3cb26: Use also truname of temporary-file-directory in shadowfile-tests.el |
Date: |
Sun, 15 Sep 2019 10:52:29 -0400 (EDT) |
branch: master
commit 6d3cb263f941545c09acb7fb86b8336ad130aa8e
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Use also truname of temporary-file-directory in shadowfile-tests.el
* test/lisp/shadowfile-tests.el (top): Use truename of
`temporary-file-directory' and
`shadow-test-remote-temporary-file-directory'. (Bug#37202)
(shadow-test08-shadow-todo, shadow-test09-shadow-copy-files):
Do not bind `shadow-test-remote-temporary-file-directory'.
---
test/lisp/shadowfile-tests.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/test/lisp/shadowfile-tests.el b/test/lisp/shadowfile-tests.el
index a93664f..d09c15e 100644
--- a/test/lisp/shadowfile-tests.el
+++ b/test/lisp/shadowfile-tests.el
@@ -66,7 +66,12 @@
(setq password-cache-expiry nil
shadow-debug t
tramp-verbose 0
- tramp-message-show-message nil)
+ tramp-message-show-message nil
+ ;; On macOS, `temporary-file-directory' is a symlinked directory.
+ temporary-file-directory (file-truename temporary-file-directory)
+ shadow-test-remote-temporary-file-directory
+ (ignore-errors
+ (file-truename shadow-test-remote-temporary-file-directory)))
;; This should happen on hydra only.
(when (getenv "EMACS_HYDRA_CI")
@@ -718,8 +723,6 @@ guaranteed by the originator of a cluster definition."
(shadow-info-file shadow-test-info-file)
(shadow-todo-file shadow-test-todo-file)
(shadow-inhibit-message t)
- (shadow-test-remote-temporary-file-directory
- (file-truename shadow-test-remote-temporary-file-directory))
shadow-clusters shadow-literal-groups shadow-regexp-groups
shadow-files-to-copy
cluster1 cluster2 primary regexp file)
@@ -858,8 +861,6 @@ guaranteed by the originator of a cluster definition."
(shadow-info-file shadow-test-info-file)
(shadow-todo-file shadow-test-todo-file)
(shadow-inhibit-message t)
- (shadow-test-remote-temporary-file-directory
- (file-truename shadow-test-remote-temporary-file-directory))
(shadow-noquery t)
shadow-clusters shadow-files-to-copy
cluster1 cluster2 primary regexp file mocked-input)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6d3cb26: Use also truname of temporary-file-directory in shadowfile-tests.el,
Michael Albinus <=