procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 'require' to load eshell-tests-helpers

Browse source 
* test/lisp/eshell/eshell-tests.el
* test/lisp/eshell/em-extpipe-tests.el: Load eshell-tests-helpers with
'require'.

* test/lisp/eshell/eshell-tests-helpers.el (eshell-history-file-name):
Define this here so individual test files don't have to.
This commit is contained in:
Jim Porter 2022-02-02 18:26:50 -08:00 • committed by Lars Ingebrigtsen
parent 3a388ab4a6
commit e3516ec28f
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/lisp/eshell/em-extpipe-tests.el
View file

@ -28,14 +28,10 @@
(require 'ert)
(require 'ert-x)
(require 'em-extpipe)
(eval-and-compile
(load (expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory)))))
(defvar eshell-history-file-name)
(defvar eshell-test--max-subprocess-time)
(declare-function eshell-command-result-p "eshell-tests-helpers")
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(defmacro em-extpipe-tests--deftest (name input &rest body)
(declare (indent 2))

2
test/lisp/eshell/eshell-tests-helpers.el
View file

@ -30,6 +30,8 @@
(require 'esh-mode)
(require 'eshell)
(defvar eshell-history-file-name nil)
(defvar eshell-test--max-subprocess-time 5
"The maximum amount of time to wait for a subprocess to finish, in seconds.
See `eshell-wait-for-subprocess'.")

14
test/lisp/eshell/eshell-tests.el
View file

@ -29,16 +29,10 @@
(require 'ert-x)
(require 'esh-mode)
(require 'eshell)
(eval-and-compile
(load (expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory)))))
(defvar eshell-history-file-name)
(defvar eshell-test--max-subprocess-time)
(declare-function eshell-insert-command "eshell-tests-helpers")
(declare-function eshell-match-result "eshell-tests-helpers")
(declare-function eshell-command-result-p "eshell-tests-helpers")
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
;;; Tests: