diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2022-07-10 18:13:50 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2022-07-10 18:13:50 +0200 |
| commit | 4bab499ed0d40d4e5ca68e5a17bcf5341125f734 (patch) | |
| tree | 4b868953b350a84dba54a05cc3e36185a7223c40 /lisp/emacs-lisp | |
| parent | f8de0d5436adbfe3e83e358c08d4367c65951212 (diff) | |
| download | emacs-4bab499ed0d40d4e5ca68e5a17bcf5341125f734.tar.gz emacs-4bab499ed0d40d4e5ca68e5a17bcf5341125f734.tar.bz2 emacs-4bab499ed0d40d4e5ca68e5a17bcf5341125f734.zip | |
Fix Tramp test environment on hydra.nixos.org
* lisp/emacs-lisp/ert-x.el (tramp-remote-path): Declare. Adapt
`tramp-remote-path' on hydra. (Bug#56424)
* test/lisp/dnd-tests.el (dnd-tests-begin-drag-files): Remove instrumentation.
* test/lisp/filenotify-tests.el:
* test/lisp/shadowfile-tests.el:
* test/lisp/net/tramp-tests.el: Do not adapt `tramp-remote-path'.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/ert-x.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el index ae72a47c2fc..21a967cb4c9 100644 --- a/lisp/emacs-lisp/ert-x.el +++ b/lisp/emacs-lisp/ert-x.el @@ -488,9 +488,13 @@ The same keyword arguments are supported as in (string-match "Apple \\(LLVM\\|[Cc]lang\\)\\|Xcode\\.app" (shell-command-to-string "gcc --version"))) - -(defvar tramp-methods) (defvar tramp-default-host-alist) +(defvar tramp-methods) +(defvar tramp-remote-path) + +;; This should happen on hydra only. +(when (getenv "EMACS_HYDRA_CI") + (add-to-list 'tramp-remote-path 'tramp-own-remote-path)) ;; If this defconst is used in a test file, `tramp' shall be loaded ;; prior `ert-x'. There is no default value on w32 systems, which |