Skip to content

Commit 2b8f9de

Browse files
committed
Minor fixes on tramp-tests.el for w32
* test/lisp/net/tramp-tests.el (tramp-test32-shell-command): Ignore absence of tput. (tramp-test43-asynchronous-requests): Don't start watchdog on w32.
1 parent 1903e99 commit 2b8f9de

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

test/lisp/net/tramp-tests.el

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4287,9 +4287,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
42874287
(ignore-errors (delete-file tmp-name)))
42884288

42894289
;; Test `async-shell-command-width'. Since Emacs 27.1.
4290-
(when (and (boundp 'async-shell-command-width)
4291-
(zerop (call-process "tput" nil nil nil "cols"))
4292-
(zerop (process-file "tput" nil nil nil "cols")))
4290+
(when (ignore-errors
4291+
(and (boundp 'async-shell-command-width)
4292+
(zerop (call-process "tput" nil nil nil "cols"))
4293+
(zerop (process-file "tput" nil nil nil "cols"))))
42934294
(let (async-shell-command-width)
42944295
(should
42954296
(string-equal
@@ -5535,12 +5536,14 @@ process sentinels. They shall not disturb each other."
55355536
(let* (;; For the watchdog.
55365537
(default-directory (expand-file-name temporary-file-directory))
55375538
(shell-file-name (if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh"))
5539+
;; It doesn't work on w32 systems.
55385540
(watchdog
5539-
(start-process-shell-command
5540-
"*watchdog*" nil
5541-
(format
5542-
"sleep %d; kill -USR1 %d"
5543-
tramp--test-asynchronous-requests-timeout (emacs-pid))))
5541+
(unless (tramp--test-windows-nt)
5542+
(start-process-shell-command
5543+
"*watchdog*" nil
5544+
(format
5545+
"sleep %d; kill -USR1 %d"
5546+
tramp--test-asynchronous-requests-timeout (emacs-pid)))))
55445547
(tmp-name (tramp--test-make-temp-name))
55455548
(default-directory tmp-name)
55465549
;; Do not cache Tramp properties.

0 commit comments

Comments
 (0)