diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-04-26 11:39:40 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-04-26 11:39:40 +0200 |
| commit | f0b9f184576a326f4359b4955a5ecff69c11c3aa (patch) | |
| tree | 74910972fcc41da2f3953539095b93132627f2be | |
| parent | 68f4a740a13ee6a1d98079ef655dd42924d24d41 (diff) | |
| download | emacs-f0b9f184576a326f4359b4955a5ecff69c11c3aa.tar.gz | |
Make shell-command tests fit for tcsh.
* test/lisp/simple-tests.el (with-shell-command-dont-erase-buffer):
Fix debug spec. Format command to run also under tcsh.
(simple-tests-shell-command-39067)
(simple-tests-shell-command-dont-erase-buffer): Quote newline in string.
| -rw-r--r-- | test/lisp/simple-tests.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index 8c477165a4f..b23b0804575 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el @@ -715,7 +715,7 @@ See Bug#21722." ;;; Tests for shell-command-dont-erase-buffer (defmacro with-shell-command-dont-erase-buffer (str output-buffer-is-current &rest body) - (declare (debug (form &body)) (indent 2)) + (declare (debug (sexp form body)) (indent 2)) (let ((expected (make-symbol "expected")) (command (make-symbol "command")) (caller-buf (make-symbol "caller-buf")) @@ -724,7 +724,7 @@ See Bug#21722." (,output-buf (if ,output-buffer-is-current ,caller-buf (generate-new-buffer "output-buf"))) (emacs (expand-file-name invocation-name invocation-directory)) - (,command (format "%s -Q --batch --eval \"(princ \\\"%s\\\")\"" + (,command (format "%s -Q --batch --eval '(princ %S)'" emacs ,str)) (inhibit-message t)) (unwind-protect @@ -745,7 +745,7 @@ See Bug#21722." (ert-deftest simple-tests-shell-command-39067 () "The output buffer is erased or not according to `shell-command-dont-erase-buffer'." - (let ((str "foo\n")) + (let ((str "foo\\n")) (dolist (output-current '(t nil)) (with-shell-command-dont-erase-buffer str output-current (let ((expected (cond ((eq shell-command-dont-erase-buffer 'erase) str) @@ -757,7 +757,7 @@ See Bug#21722." (ert-deftest simple-tests-shell-command-dont-erase-buffer () "The point is set at the expected position after execution of the command." - (let* ((str "foo\n") + (let* ((str "foo\\n") (expected-point `((beg-last-out . ,(1+ (length str))) (end-last-out . ,(1+ (* 2 (length str)))) (save-point . 1)))) |