mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-25 15:00:45 -08:00
498d31e9f0
This really just generalizes Eshell's previous support for iterative evaluation of a single current command to a list of multiple commands, of which at most one can be in the foreground (bug#66066). * lisp/eshell/esh-cmd.el (eshell-last-async-procs) (eshell-current-command): Make obsolete in favor of... (eshell-foreground-command): ... this (eshell-background-commands): New variable. (eshell-interactive-process-p): Make obsolete. (eshell-head-process, eshell-tail-process): Use 'eshell-foreground-command'. (eshell-cmd-initialize): Initialize new variables. (eshell-add-command, eshell-remove-command) (eshell-commands-for-process): New functions. (eshell-parse-command): Make 'eshell-do-subjob' the outermost call. (eshell-do-subjob): Call 'eshell-resume-eval' to split this command off from its parent forms. (eshell-eval-command): Use 'eshell-add-command'. (eshell-resume-command): Use 'eshell-commands-for-process'. (eshell-resume-eval): Take a COMMAND argument. Return ':eshell-background' form for deferred background commands. (eshell-do-eval): Remove check for 'eshell-current-subjob-p'. This is handled differently now. * lisp/eshell/eshell.el (eshell-command): Wait for all processes to exit when running synchronously. * lisp/eshell/esh-mode.el (eshell-intercept-commands) (eshell-watch-for-password-prompt): * lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments): * lisp/eshell/em-smart.el (eshell-smart-display-move): Use 'eshell-foreground-command'. * test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/background/simple-command) (esh-cmd-test/background/subcommand): New tests. (esh-cmd-test/throw): Use 'eshell-foreground-command'. * test/lisp/eshell/eshell-tests.el (eshell-test/queue-input): Use 'eshell-foreground-command'. * test/lisp/eshell/em-script-tests.el (em-script-test/source-script/background): Make the test script more complex. * test/lisp/eshell/eshell-tests.el (eshell-test/eshell-command/pipeline-wait): New test. * doc/misc/eshell.texi (Bugs and ideas): Remove implemented feature.
97 lines
3.6 KiB
EmacsLisp
97 lines
3.6 KiB
EmacsLisp
;;; em-script-tests.el --- em-script test suite -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2022-2023 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/background ()
|
|
"Test sourcing a script in the background."
|
|
(skip-unless (executable-find "echo"))
|
|
(ert-with-temp-file temp-file
|
|
:text "*echo hi\nif {[ foo = foo ]} {*echo bye}"
|
|
(eshell-with-temp-buffer bufname "old"
|
|
(with-temp-eshell
|
|
(eshell-match-command-output
|
|
(format "source %s > #<%s> &" temp-file bufname)
|
|
"\\`\\'")
|
|
(eshell-wait-for-subprocess t))
|
|
(should (equal (buffer-string) "hi\nbye\n")))))
|
|
|
|
(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
|