aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2019-06-11 20:28:31 +0200
committerMichael Albinus2019-06-11 20:28:31 +0200
commit2b8f9ded06590d8e299ed25e09a0db7af0299fe4 (patch)
tree7188550d70ccfcbda9d05ed3f5e36a36065a490a
parent1903e9964f2fd16b604f4ef50390dfa9b4d90a9a (diff)
downloademacs-2b8f9ded06590d8e299ed25e09a0db7af0299fe4.tar.gz
emacs-2b8f9ded06590d8e299ed25e09a0db7af0299fe4.zip
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.
-rw-r--r--test/lisp/net/tramp-tests.el19
1 files changed, 11 insertions, 8 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 9bdd708c92d..d4067becf93 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'."
4287 (ignore-errors (delete-file tmp-name))) 4287 (ignore-errors (delete-file tmp-name)))
4288 4288
4289 ;; Test `async-shell-command-width'. Since Emacs 27.1. 4289 ;; Test `async-shell-command-width'. Since Emacs 27.1.
4290 (when (and (boundp 'async-shell-command-width) 4290 (when (ignore-errors
4291 (zerop (call-process "tput" nil nil nil "cols")) 4291 (and (boundp 'async-shell-command-width)
4292 (zerop (process-file "tput" nil nil nil "cols"))) 4292 (zerop (call-process "tput" nil nil nil "cols"))
4293 (zerop (process-file "tput" nil nil nil "cols"))))
4293 (let (async-shell-command-width) 4294 (let (async-shell-command-width)
4294 (should 4295 (should
4295 (string-equal 4296 (string-equal
@@ -5535,12 +5536,14 @@ process sentinels. They shall not disturb each other."
5535 (let* (;; For the watchdog. 5536 (let* (;; For the watchdog.
5536 (default-directory (expand-file-name temporary-file-directory)) 5537 (default-directory (expand-file-name temporary-file-directory))
5537 (shell-file-name (if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh")) 5538 (shell-file-name (if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh"))
5539 ;; It doesn't work on w32 systems.
5538 (watchdog 5540 (watchdog
5539 (start-process-shell-command 5541 (unless (tramp--test-windows-nt)
5540 "*watchdog*" nil 5542 (start-process-shell-command
5541 (format 5543 "*watchdog*" nil
5542 "sleep %d; kill -USR1 %d" 5544 (format
5543 tramp--test-asynchronous-requests-timeout (emacs-pid)))) 5545 "sleep %d; kill -USR1 %d"
5546 tramp--test-asynchronous-requests-timeout (emacs-pid)))))
5544 (tmp-name (tramp--test-make-temp-name)) 5547 (tmp-name (tramp--test-make-temp-name))
5545 (default-directory tmp-name) 5548 (default-directory tmp-name)
5546 ;; Do not cache Tramp properties. 5549 ;; Do not cache Tramp properties.