From f87a9e359e94587b301cb65d8a255381fee687bf Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 15 Jun 2019 21:38:11 +0200 Subject: [PATCH] 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. --- lisp/net/trampver.el | 9 +++++---- test/lisp/net/tramp-tests.el | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 5f10cd30ba6..81d80d0a5a7 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.3.5.26.2 +;; Version: 2.3.5.26.3 ;; This file is part of GNU Emacs. @@ -33,7 +33,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.3.5.26.2" +(defconst tramp-version "2.3.5.26.3" "This version of Tramp.") ;;;###tramp-autoload @@ -55,7 +55,7 @@ ;; Check for Emacs version. (let ((x (if (>= emacs-major-version 24) "ok" - (format "Tramp 2.3.5.26.2 is not fit for %s" + (format "Tramp 2.3.5.26.3 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) @@ -74,7 +74,8 @@ ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5") ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2") ("2.2.13.25.2" . "25.3") - ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2"))) + ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2") + ("2.3.5.26.3" . "26.3"))) (add-hook 'tramp-unload-hook (lambda () 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 -- 2.39.2