mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-27 16:51:06 -07:00
Fix non-interactive use of conditionals in Eshell
* lisp/eshell/esh-cmd.el (eshell-rewrite-if-command): Fix misplaced 't' symbol; it should be passed to 'eshell-invokify-arg'. (eshell-do-eval): Pass 'synchronous-p' to recursive calls in some missing cases. * test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/if-statement, (esh-cmd-test/if-else-statement) (esh-cmd-test/if-else-statement-lisp-form) (esh-cmd-test/if-else-statement-lisp-form-2) (esh-cmd-test/if-else-statement-ext-cmd) (esh-cmd-test/unless-statement) (esh-cmd-test/unless-else-statement) (esh-cmd-test/unless-else-statement-lisp-form) (esh-cmd-test/unless-else-statement-ext-cmd): Use 'eshell-command-result-equal'.
This commit is contained in:
Jim Porter
parent
c1f1be4b73
commit
cf873c1a09
2 changed files with 59 additions and 67 deletions
|
|
@ -607,7 +607,7 @@ must be implemented via rewriting, rather than as a function."
|
|||
t))
|
||||
(if (= (length terms) 4)
|
||||
`(eshell-protect
|
||||
,(eshell-invokify-arg (car (last terms)))) t))))
|
||||
,(eshell-invokify-arg (car (last terms)) t))))))
|
||||
|
||||
(defvar eshell-last-command-result) ;Defined in esh-io.el.
|
||||
|
||||
|
|
@ -1122,7 +1122,7 @@ be finished later after the completion of an asynchronous subprocess."
|
|||
(setcar eshell-test-body nil))
|
||||
(unless (car eshell-test-body)
|
||||
(setcar eshell-test-body (copy-tree (car args))))
|
||||
(while (cadr (eshell-do-eval (car eshell-test-body)))
|
||||
(while (cadr (eshell-do-eval (car eshell-test-body) synchronous-p))
|
||||
(setcar eshell-command-body
|
||||
(if (cddr args)
|
||||
`(progn ,@(copy-tree (cdr args)))
|
||||
|
|
@ -1142,7 +1142,8 @@ be finished later after the completion of an asynchronous subprocess."
|
|||
(setcar eshell-test-body (copy-tree (car args))))
|
||||
(setcar eshell-command-body
|
||||
(copy-tree
|
||||
(if (cadr (eshell-do-eval (car eshell-test-body)))
|
||||
(if (cadr (eshell-do-eval (car eshell-test-body)
|
||||
synchronous-p))
|
||||
(cadr args)
|
||||
(car (cddr args)))))
|
||||
(eshell-do-eval (car eshell-command-body) synchronous-p))
|
||||
|
|
|
|||
|
|
@ -188,97 +188,88 @@ e.g. \"{(+ 1 2)} 3\" => 3"
|
|||
|
||||
(ert-deftest esh-cmd-test/if-statement ()
|
||||
"Test invocation of an if statement."
|
||||
(with-temp-eshell
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-match-command-output "if $eshell-test-value {echo yes}"
|
||||
"yes\n"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-match-command-output "if $eshell-test-value {echo yes}"
|
||||
"\\`\\'"))))
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-command-result-equal "if $eshell-test-value {echo yes}"
|
||||
"yes"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-command-result-equal "if $eshell-test-value {echo yes}"
|
||||
nil)))
|
||||
|
||||
(ert-deftest esh-cmd-test/if-else-statement ()
|
||||
"Test invocation of an if/else statement."
|
||||
(with-temp-eshell
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-match-command-output "if $eshell-test-value {echo yes} {echo no}"
|
||||
"yes\n"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-match-command-output "if $eshell-test-value {echo yes} {echo no}"
|
||||
"no\n"))))
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-command-result-equal "if $eshell-test-value {echo yes} {echo no}"
|
||||
"yes"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-command-result-equal "if $eshell-test-value {echo yes} {echo no}"
|
||||
"no")))
|
||||
|
||||
(ert-deftest esh-cmd-test/if-else-statement-lisp-form ()
|
||||
"Test invocation of an if/else statement using a Lisp form."
|
||||
(with-temp-eshell
|
||||
(eshell-match-command-output "if (zerop 0) {echo yes} {echo no}"
|
||||
"yes\n")
|
||||
(eshell-match-command-output "if (zerop 1) {echo yes} {echo no}"
|
||||
"no\n")
|
||||
(let ((debug-on-error nil))
|
||||
(eshell-match-command-output "if (zerop \"foo\") {echo yes} {echo no}"
|
||||
"no\n"))))
|
||||
(eshell-command-result-equal "if (zerop 0) {echo yes} {echo no}"
|
||||
"yes")
|
||||
(eshell-command-result-equal "if (zerop 1) {echo yes} {echo no}"
|
||||
"no")
|
||||
(let ((debug-on-error nil))
|
||||
(eshell-command-result-equal "if (zerop \"foo\") {echo yes} {echo no}"
|
||||
"no")))
|
||||
|
||||
(ert-deftest esh-cmd-test/if-else-statement-lisp-form-2 ()
|
||||
"Test invocation of an if/else statement using a Lisp form.
|
||||
This tests when `eshell-lisp-form-nil-is-failure' is nil."
|
||||
(let ((eshell-lisp-form-nil-is-failure nil))
|
||||
(with-temp-eshell
|
||||
(eshell-match-command-output "if (zerop 0) {echo yes} {echo no}"
|
||||
"yes\n")
|
||||
(eshell-match-command-output "if (zerop 1) {echo yes} {echo no}"
|
||||
"yes\n")
|
||||
(let ((debug-on-error nil))
|
||||
(eshell-match-command-output "if (zerop \"foo\") {echo yes} {echo no}"
|
||||
"no\n")))))
|
||||
(eshell-command-result-equal "if (zerop 0) {echo yes} {echo no}"
|
||||
"yes")
|
||||
(eshell-command-result-equal "if (zerop 1) {echo yes} {echo no}"
|
||||
"yes")
|
||||
(let ((debug-on-error nil))
|
||||
(eshell-command-result-equal "if (zerop \"foo\") {echo yes} {echo no}"
|
||||
"no"))))
|
||||
|
||||
(ert-deftest esh-cmd-test/if-else-statement-ext-cmd ()
|
||||
"Test invocation of an if/else statement using an external command."
|
||||
(skip-unless (executable-find "["))
|
||||
(with-temp-eshell
|
||||
(eshell-match-command-output "if {[ foo = foo ]} {echo yes} {echo no}"
|
||||
"yes\n")
|
||||
(eshell-match-command-output "if {[ foo = bar ]} {echo yes} {echo no}"
|
||||
"no\n")))
|
||||
(eshell-command-result-equal "if {[ foo = foo ]} {echo yes} {echo no}"
|
||||
"yes")
|
||||
(eshell-command-result-equal "if {[ foo = bar ]} {echo yes} {echo no}"
|
||||
"no"))
|
||||
|
||||
(ert-deftest esh-cmd-test/unless-statement ()
|
||||
"Test invocation of an unless statement."
|
||||
(with-temp-eshell
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-match-command-output "unless $eshell-test-value {echo no}"
|
||||
"\\`\\'"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-match-command-output "unless $eshell-test-value {echo no}"
|
||||
"no\n"))))
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-command-result-equal "unless $eshell-test-value {echo no}"
|
||||
nil))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-command-result-equal "unless $eshell-test-value {echo no}"
|
||||
"no")))
|
||||
|
||||
(ert-deftest esh-cmd-test/unless-else-statement ()
|
||||
"Test invocation of an unless/else statement."
|
||||
(with-temp-eshell
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-match-command-output
|
||||
"unless $eshell-test-value {echo no} {echo yes}"
|
||||
"yes\n"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-match-command-output
|
||||
"unless $eshell-test-value {echo no} {echo yes}"
|
||||
"no\n"))))
|
||||
(let ((eshell-test-value t))
|
||||
(eshell-command-result-equal
|
||||
"unless $eshell-test-value {echo no} {echo yes}"
|
||||
"yes"))
|
||||
(let ((eshell-test-value nil))
|
||||
(eshell-command-result-equal
|
||||
"unless $eshell-test-value {echo no} {echo yes}"
|
||||
"no")))
|
||||
|
||||
(ert-deftest esh-cmd-test/unless-else-statement-lisp-form ()
|
||||
"Test invocation of an unless/else statement using a Lisp form."
|
||||
(with-temp-eshell
|
||||
(eshell-match-command-output "unless (zerop 0) {echo no} {echo yes}"
|
||||
"yes\n")
|
||||
(eshell-match-command-output "unless (zerop 1) {echo no} {echo yes}"
|
||||
"no\n")
|
||||
(let ((debug-on-error nil))
|
||||
(eshell-match-command-output "unless (zerop \"foo\") {echo no} {echo yes}"
|
||||
"no\n"))))
|
||||
(eshell-command-result-equal "unless (zerop 0) {echo no} {echo yes}"
|
||||
"yes")
|
||||
(eshell-command-result-equal "unless (zerop 1) {echo no} {echo yes}"
|
||||
"no")
|
||||
(let ((debug-on-error nil))
|
||||
(eshell-command-result-equal "unless (zerop \"foo\") {echo no} {echo yes}"
|
||||
"no")))
|
||||
|
||||
(ert-deftest esh-cmd-test/unless-else-statement-ext-cmd ()
|
||||
"Test invocation of an unless/else statement using an external command."
|
||||
(skip-unless (executable-find "["))
|
||||
(with-temp-eshell
|
||||
(eshell-match-command-output "unless {[ foo = foo ]} {echo no} {echo yes}"
|
||||
"yes\n")
|
||||
(eshell-match-command-output "unless {[ foo = bar ]} {echo no} {echo yes}"
|
||||
"no\n")))
|
||||
(eshell-command-result-equal "unless {[ foo = foo ]} {echo no} {echo yes}"
|
||||
"yes")
|
||||
(eshell-command-result-equal "unless {[ foo = bar ]} {echo no} {echo yes}"
|
||||
"no"))
|
||||
|
||||
;; esh-cmd-tests.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue