procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt tramp-test32-shell-command

Browse source 
* test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
Check "tput" before running `shell-command-width' test.
This commit is contained in:
Michael Albinus 2019-04-19 11:30:22 +02:00
parent f5e3c2cc98
commit 3ff7d7321a
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/lisp/net/tramp-tests.el
View file

@ -4193,16 +4193,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
(ignore-errors (delete-file tmp-name)))
;; Test `shell-command-width' of `async-shell-command'.
;; `executable-find' has changed the number of parameters in
;; Emacs 27.1, so we use `apply' for older Emacsen.
(when (and (executable-find "tput")
(apply #'executable-find '("tput" 'remote)))
(when (and (zerop (call-process "tput" nil nil nil "cols"))
(zerop (process-file "tput" nil nil nil "cols")))
(let (shell-command-width)
(should
(string-equal
;; `frame-width' does not return a proper value.
;; `process-lines' uses `call-process', it doesn't care
;; about `shell-command-width'.
(format "%s\n" (car (process-lines "tput" "cols")))
(tramp--test-shell-command-to-string-asynchronously
"tput cols")))