From 8093e82e429d598d72ae7e51d4a2d5a49d98902e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 23 Oct 2017 12:46:32 +0200 Subject: [PATCH] Improve backward compatibility of tramp-tests.el * test/lisp/net/tramp-tests.el (tramp--test-emacs26-p): Fix docstring. (tramp-test41-unload): Skip unless Emacs >= 26. --- test/lisp/net/tramp-tests.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index e92d1b6203c..fdd816dae2e 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3678,7 +3678,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (defun tramp--test-emacs26-p () "Check for Emacs version >= 26.1. Some semantics has been changed for there, w/o new functions or -variables, so we check function Emacs version directly." +variables, so we check the Emacs version directly." (>= emacs-major-version 26)) (defun tramp--test-adb-p () @@ -4338,6 +4338,9 @@ process sentinels. They shall not disturb each other." Since it unloads Tramp, it shall be the last test to run." :tags '(:expensive-test) (skip-unless noninteractive) + ;; The autoloaded Tramp objects are different since Emacs 26.1. We + ;; cannot test older Emacsen, therefore. + (skip-unless (tramp--test-emacs26-p)) (when (featurep 'tramp) (unload-feature 'tramp 'force) -- 2.39.2