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.

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 5f10cd30ba6687a880c9068af45bce39d84c2cba..81d80d0a5a7db0f84184d642092bd9b8391f7935 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; 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 03b0018298b2a905c451a3b242457f1eba863250..203bcfb6511391752d58d8ed3c3cb152ab1401ca 100644 (file)
--- 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