mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-11 00:30:17 -08:00
6defbd65b6
Previously, the output handles in nested forms would be reset to the
default, leading to wrong behavior for commands like
{echo a; echo b} > file
"b" would be written to "file" as expected, but "a" would go to
standard output (bug#59545).
* lisp/eshell/esh-cmd.el (eshell-parse-command): Use
'eshell-with-copied-handles' for each statement within the whole
Eshell command.
* test/lisp/eshell/esh-io-tests.el (esh-io-test/redirect-subcommands)
(esh-io-test/redirect-subcommands/override)
(esh-io-test/redirect-subcommands/interpolated): New tests.
* test/lisp/eshell/em-script-tests.el
(em-script-test/source-script/redirect)
(em-script-test/source-script/redirect/dev-null): New tests.
(em-script-test/source-script, em-script-test/source-script/arg-vars)
(em-script-test/source-script/all-args-var): Tweak names/docstrings.
* test/lisp/eshell/em-extpipe-tests.el (em-extpipe-tests--deftest):
Skip over the newly-added 'eshell-with-copied-handles' form when
checking the parse results.
* test/lisp/eshell/em-tramp-tests.el (em-tramp-test/su-default)
(em-tramp-test/su-user, em-tramp-test/su-login)
(em-tramp-test/sudo-shell, em-tramp-test/sudo-user-shell)
(em-tramp-test/doas-shell, em-tramp-test/doas-user-shell): Update
expected command forms.
84 lines
3.1 KiB
EmacsLisp
84 lines
3.1 KiB
EmacsLisp
;;; em-script-tests.el --- em-script test suite -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2022 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Tests for Eshell's script module.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'esh-mode)
|
|
(require 'eshell)
|
|
(require 'em-script)
|
|
|
|
(require 'eshell-tests-helpers
|
|
(expand-file-name "eshell-tests-helpers"
|
|
(file-name-directory (or load-file-name
|
|
default-directory))))
|
|
;;; Tests:
|
|
|
|
(ert-deftest em-script-test/source-script ()
|
|
"Test sourcing a simple script."
|
|
(ert-with-temp-file temp-file :text "echo hi"
|
|
(with-temp-eshell
|
|
(eshell-match-command-output (format "source %s" temp-file)
|
|
"hi\n"))))
|
|
|
|
(ert-deftest em-script-test/source-script/redirect ()
|
|
"Test sourcing a script and redirecting its output."
|
|
(ert-with-temp-file temp-file
|
|
:text "echo hi\necho bye"
|
|
(eshell-with-temp-buffer bufname "old"
|
|
(with-temp-eshell
|
|
(eshell-match-command-output
|
|
(format "source %s > #<%s>" temp-file bufname)
|
|
"\\`\\'"))
|
|
(should (equal (buffer-string) "hibye")))))
|
|
|
|
(ert-deftest em-script-test/source-script/redirect/dev-null ()
|
|
"Test sourcing a script and redirecting its output, including to /dev/null."
|
|
(ert-with-temp-file temp-file
|
|
:text "echo hi\necho bad > /dev/null\necho bye"
|
|
(eshell-with-temp-buffer bufname "old"
|
|
(with-temp-eshell
|
|
(eshell-match-command-output
|
|
(format "source %s > #<%s>" temp-file bufname)
|
|
"\\`\\'"))
|
|
(should (equal (buffer-string) "hibye")))))
|
|
|
|
(ert-deftest em-script-test/source-script/arg-vars ()
|
|
"Test sourcing script with $0, $1, ... variables."
|
|
(ert-with-temp-file temp-file :text "printnl $0 \"$1 $2\""
|
|
(with-temp-eshell
|
|
(eshell-match-command-output (format "source %s one two" temp-file)
|
|
(format "%s\none two\n" temp-file)))))
|
|
|
|
(ert-deftest em-script-test/source-script/all-args-var ()
|
|
"Test sourcing script with the $* variable."
|
|
(ert-with-temp-file temp-file :text "printnl $*"
|
|
(with-temp-eshell
|
|
(eshell-match-command-output (format "source %s" temp-file)
|
|
"\\`\\'")
|
|
(eshell-match-command-output (format "source %s a" temp-file)
|
|
"a\n")
|
|
(eshell-match-command-output (format "source %s a b c" temp-file)
|
|
"a\nb\nc\n"))))
|
|
|
|
;; em-script-tests.el ends here
|