[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2b8f9de: Minor fixes on tramp-tests.el for w32
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 2b8f9de: Minor fixes on tramp-tests.el for w32 |
Date: |
Tue, 11 Jun 2019 14:28:38 -0400 (EDT) |
branch: master
commit 2b8f9ded06590d8e299ed25e09a0db7af0299fe4
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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.
---
test/lisp/net/tramp-tests.el | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 9bdd708..d4067be 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4287,9 +4287,10 @@ This tests also `make-symbolic-link', `file-truename'
and `add-name-to-file'."
(ignore-errors (delete-file tmp-name)))
;; Test `async-shell-command-width'. Since Emacs 27.1.
- (when (and (boundp 'async-shell-command-width)
- (zerop (call-process "tput" nil nil nil "cols"))
- (zerop (process-file "tput" nil nil nil "cols")))
+ (when (ignore-errors
+ (and (boundp 'async-shell-command-width)
+ (zerop (call-process "tput" nil nil nil "cols"))
+ (zerop (process-file "tput" nil nil nil "cols"))))
(let (async-shell-command-width)
(should
(string-equal
@@ -5535,12 +5536,14 @@ process sentinels. They shall not disturb each other."
(let* (;; For the watchdog.
(default-directory (expand-file-name temporary-file-directory))
(shell-file-name (if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh"))
+ ;; It doesn't work on w32 systems.
(watchdog
- (start-process-shell-command
- "*watchdog*" nil
- (format
- "sleep %d; kill -USR1 %d"
- tramp--test-asynchronous-requests-timeout (emacs-pid))))
+ (unless (tramp--test-windows-nt)
+ (start-process-shell-command
+ "*watchdog*" nil
+ (format
+ "sleep %d; kill -USR1 %d"
+ tramp--test-asynchronous-requests-timeout (emacs-pid)))))
(tmp-name (tramp--test-make-temp-name))
(default-directory tmp-name)
;; Do not cache Tramp properties.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2b8f9de: Minor fixes on tramp-tests.el for w32,
Michael Albinus <=