]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix tramp-test32-shell-command
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 17 Apr 2019 19:23:41 +0000 (21:23 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 17 Apr 2019 19:23:41 +0000 (21:23 +0200)
* test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
Run only if "tput" exist.

test/lisp/net/tramp-tests.el

index 24eb7d6f0bf9241760d8e337201a2baa52dfe7b7..c88b1b83da99821df47388aad161be3393cd136d 100644 (file)
@@ -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"