[Emacs-diffs] master 2116dff: Fix tramp-test32-shell-command

[Michael Albinus]

branch: master
commit 2116dfffce257dd727409788b1d5a9dca9754543
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Fix tramp-test32-shell-command
    
    * test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
    Run only if "tput" exist.
---
 test/lisp/net/tramp-tests.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 24eb7d6..c88b1b8 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'."
        (ignore-errors (delete-file tmp-name)))
 
       ;; Test `shell-command-width' of `async-shell-command'.
-      (when (tramp--test-sh-p)
+
+      ;; `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)))
        (let (shell-command-width)
-          (tramp--test-message "Hallo1 %s" (ignore-errors (car (process-lines 
"tput" "cols"))))
-          (tramp--test-message "Hallo2 %s" (ignore-errors 
(tramp--test-shell-command-to-string-asynchronously "tput cols")))
          (should
           (string-equal
            ;; `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'."
            (tramp--test-shell-command-to-string-asynchronously
             "tput cols")))
          (setq shell-command-width 1024)
-          (tramp--test-message "Hallo3 %s" (ignore-errors 
(tramp--test-shell-command-to-string-asynchronously "tput cols")))
          (should
           (string-equal
            "1024\n"