diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2019-06-15 21:38:11 +0200 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-15 21:38:11 +0200 |
commit | f87a9e359e94587b301cb65d8a255381fee687bf (patch) | |
tree | 6b5f2d76ee05a7fe18b1ce9a652f61b8ec38a45c /test | |
parent | 200f63cfa5904462cdcb440d4da63dfa92c666a6 (diff) | |
download | emacs-f87a9e359e94587b301cb65d8a255381fee687bf.tar.gz |
Fix accidential change in tramp-tests; do not merge with master
* lisp/net/trampver.el: Change version to "2.3.5.26.3".
(customize-package-emacs-version-alist): Add Tramp version
integrated in Emacs 26.3.
* test/lisp/net/tramp-tests.el (tramp-test42-auto-load):
Add skip for w32.
Diffstat (limited to 'test')
-rw-r--r-- | test/lisp/net/tramp-tests.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 03b0018298b..203bcfb6511 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4682,7 +4682,8 @@ process sentinels. They shall not disturb each other." ;; This test is inspired by Bug#29163. (ert-deftest tramp-test42-auto-load () "Check that Tramp autoloads properly." - :expected-result (if (tramp--test-enabled) :passed :failed) + (skip-unless (tramp--test-enabled)) + (let ((default-directory (expand-file-name temporary-file-directory)) (code (format |