diff options
| author | Michael Albinus | 2019-04-17 21:23:41 +0200 |
|---|---|---|
| committer | Michael Albinus | 2019-04-17 21:23:41 +0200 |
| commit | 2116dfffce257dd727409788b1d5a9dca9754543 (patch) | |
| tree | 405dbdaf1f6cacb55471fc10f1e07eb8fd9915c3 /test | |
| parent | 0797897f34467272b150eba54aa3bbff19e92aa1 (diff) | |
| download | emacs-2116dfffce257dd727409788b1d5a9dca9754543.tar.gz emacs-2116dfffce257dd727409788b1d5a9dca9754543.zip | |
Fix tramp-test32-shell-command
* test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
Run only if "tput" exist.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 24eb7d6f0bf..c88b1b83da9 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -4186,10 +4186,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." | |||
| 4186 | (ignore-errors (delete-file tmp-name))) | 4186 | (ignore-errors (delete-file tmp-name))) |
| 4187 | 4187 | ||
| 4188 | ;; Test `shell-command-width' of `async-shell-command'. | 4188 | ;; Test `shell-command-width' of `async-shell-command'. |
| 4189 | (when (tramp--test-sh-p) | 4189 | |
| 4190 | ;; `executable-find' has changed the number of parameters in | ||
| 4191 | ;; Emacs 27.1, so we use `apply' for older Emacsen. | ||
| 4192 | (when (and (executable-find "tput") | ||
| 4193 | (apply #'executable-find '("tput" 'remote))) | ||
| 4190 | (let (shell-command-width) | 4194 | (let (shell-command-width) |
| 4191 | (tramp--test-message "Hallo1 %s" (ignore-errors (car (process-lines "tput" "cols")))) | ||
| 4192 | (tramp--test-message "Hallo2 %s" (ignore-errors (tramp--test-shell-command-to-string-asynchronously "tput cols"))) | ||
| 4193 | (should | 4195 | (should |
| 4194 | (string-equal | 4196 | (string-equal |
| 4195 | ;; `frame-width' does not return a proper value. | 4197 | ;; `frame-width' does not return a proper value. |
| @@ -4199,7 +4201,6 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." | |||
| 4199 | (tramp--test-shell-command-to-string-asynchronously | 4201 | (tramp--test-shell-command-to-string-asynchronously |
| 4200 | "tput cols"))) | 4202 | "tput cols"))) |
| 4201 | (setq shell-command-width 1024) | 4203 | (setq shell-command-width 1024) |
| 4202 | (tramp--test-message "Hallo3 %s" (ignore-errors (tramp--test-shell-command-to-string-asynchronously "tput cols"))) | ||
| 4203 | (should | 4204 | (should |
| 4204 | (string-equal | 4205 | (string-equal |
| 4205 | "1024\n" | 4206 | "1024\n" |