emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 3ff7d73: Adapt tramp-test32-shell-command


From: Michael Albinus
Subject: [Emacs-diffs] master 3ff7d73: Adapt tramp-test32-shell-command
Date: Fri, 19 Apr 2019 05:30:37 -0400 (EDT)

branch: master
commit 3ff7d7321ac62b1eb896e8a032e7f75f5a6b8146
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Adapt tramp-test32-shell-command
    
    * test/lisp/net/tramp-tests.el (tramp-test32-shell-command):
    Check "tput" before running `shell-command-width' test.
---
 test/lisp/net/tramp-tests.el | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index f228c5c..cadb282 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -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")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]