summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2026-05-22 18:37:36 +0200
committerMichael Albinus <michael.albinus@gmx.de>2026-05-22 18:37:36 +0200
commite0fbecaf658b95d3c53aa9f1bc078a3326a3f77c (patch)
treef9ee92eea6afc070eb5e49aab44a11060b14e4a0
parent3de7f0ce5e5fca16045b3f96ceab607d66782d4d (diff)
Adapt ert-remote-temporary-file-directory settings
* lisp/emacs-lisp/ert-x.el (tramp-default-remote-shell) (tramp-encoding-shell): Declare. (tramp-methods) <mock>: Add `tramp-tmpdir'. Adapt `tramp-login-program' and `tramp-remote-shell'.
-rw-r--r--lisp/emacs-lisp/ert-x.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 0952033a6cc..b6d52b8b3c5 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -379,6 +379,8 @@ The same keyword arguments are supported as in
(ffap--gcc-is-clang-p))
(defvar tramp-default-host-alist)
+(defvar tramp-default-remote-shell)
+(defvar tramp-encoding-shell)
(defvar tramp-methods)
(defvar tramp-remote-path)
@@ -394,16 +396,17 @@ The same keyword arguments are supported as in
(cond
((getenv "REMOTE_TEMPORARY_FILE_DIRECTORY"))
((eq system-type 'windows-nt) null-device)
- ;; Android's built-in shell is far too dysfunctional to support
+ ;; Android's built-in shell is far too dysfunctional to support.
;; Tramp.
((eq system-type 'android) null-device)
(t (add-to-list
'tramp-methods
- '("mock"
- (tramp-login-program "sh")
+ `("mock"
+ (tramp-login-program ,tramp-encoding-shell)
(tramp-login-args (("-i")))
- (tramp-direct-async ("-c"))
- (tramp-remote-shell "/bin/sh")
+ (tramp-direct-async ("-c"))
+ (tramp-tmpdir ,temporary-file-directory)
+ (tramp-remote-shell ,tramp-default-remote-shell)
(tramp-remote-shell-args ("-c"))
(tramp-connection-timeout 10)))
(add-to-list