From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 30 May 2022 04:30:24 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1910^2~339
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52d41f2750c0f66d7f7ba8e198832734fe750fa5;p=emacs.git

Merge from origin/emacs-28

1b7b69e764 Some Tramp cleanup on MS Windows
---

52d41f2750c0f66d7f7ba8e198832734fe750fa5
diff --cc test/lisp/net/tramp-tests.el
index 1532cbe0493,61fa6a5ae4e..569e9506d1e
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@@ -5088,13 -5014,15 +5088,14 @@@ If UNSTABLE is non-nil, the test is tag
  
  (ert-deftest tramp-test31-interrupt-process ()
    "Check `interrupt-process'."
 -  :tags (append '(:expensive-test :tramp-asynchronous-processes)
 -		(and (or (getenv "EMACS_HYDRA_CI") (getenv "EMACS_EMBA_CI"))
 -		     '(:unstable)))
 +  ;; The final `process-live-p' check does not run sufficiently.
 +  :tags '(:expensive-test :tramp-asynchronous-processes :unstable)
    (skip-unless (tramp--test-enabled))
    (skip-unless (tramp--test-sh-p))
+   (skip-unless (not (tramp--test-windows-nt-p)))
    (skip-unless (not (tramp--test-crypt-p)))
 -  ;; Since Emacs 26.1.
 -  (skip-unless (boundp 'interrupt-process-functions))
 +  ;; Since Emacs 27.1.
 +  (skip-unless (macrop 'with-connection-local-variables))
  
    ;; We must use `file-truename' for the temporary directory, in
    ;; order to establish the connection prior running an asynchronous