From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 17 Apr 2019 19:23:41 +0000 (+0200)
Subject: Fix tramp-test32-shell-command
X-Git-Tag: emacs-27.0.90~3225
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2116dfffce257dd727409788b1d5a9dca9754543;p=emacs.git

Fix tramp-test32-shell-command

* test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
Run only if "tput" exist.
---

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'."
 	(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"