Port Eshell tests to Android

* test/infra/android/test-controller.el (ats-run-test): Run
tests in a temp buffer.

* test/lisp/eshell/em-alias-tests.el (ert, em-alias)
(eshell-tests-helpers):

* test/lisp/eshell/em-basic-tests.el (em-basic)
(eshell-tests-helpers):

* test/lisp/eshell/em-cmpl-tests.el (em-unix)
(eshell-tests-helpers):

* test/lisp/eshell/em-dirs-tests.el (em-dirs)
(eshell-tests-helpers):

* test/lisp/eshell/em-extpipe-tests.el (ert-x)
(eshell-tests-helpers):

* test/lisp/eshell/em-glob-tests.el (ert, eshell-tests-helpers):

* test/lisp/eshell/em-hist-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/em-pred-tests.el (em-pred)
(eshell-tests-helpers):

* test/lisp/eshell/em-prompt-tests.el (em-prompt)
(eshell-tests-helpers):

* test/lisp/eshell/em-script-tests.el (em-script)
(eshell-tests-helpers):

* test/lisp/eshell/em-unix-tests.el (ert-x)
(eshell-tests-helpers):

* test/lisp/eshell/esh-arg-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-cmd-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-ext-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-io-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/esh-mode-tests.el (em-prompt)
(eshell-tests-helpers):

* test/lisp/eshell/esh-proc-tests.el (em-prompt)
(eshell-tests-helpers):

* test/lisp/eshell/esh-util-tests.el (esh-util)
(eshell-tests-helpers):

* test/lisp/eshell/esh-var-tests.el (eshell)
(eshell-tests-helpers):

* test/lisp/eshell/eshell-tests.el (esh-mode)
(eshell-tests-helpers): Load `eshell-tests-helpers' from the
resource directory.

* test/lisp/eshell/resources/eshell-tests-helpers.el: Move from
`test/lisp/eshell'.
This commit is contained in:
Po Lu 2025-02-26 16:03:12 +08:00
parent 86dd455e9c
commit 3e496fc317
22 changed files with 46 additions and 59 deletions

View file

@ -2442,7 +2442,11 @@ Display the output of the tests executed in a buffer."
(with-current-buffer temp-buffer
(insert message "\n")))))
(let ((noninteractive t))
(ert-run-tests-batch ',selector))
;; Prevent activation of the mark and
;; other actions taken by the tests
;; from affecting the test buffer.
(with-temp-buffer
(ert-run-tests-batch ',selector)))
(insert "=== Test execution complete ===\n")
(buffer-substring-no-properties
(point-min) (point-max)))))))

View file

@ -24,14 +24,14 @@
;;; Code:
(require 'ert)
(require 'ert-x)
(require 'esh-mode)
(require 'eshell)
(require 'em-alias)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(ert-deftest em-alias-test/simple-alias ()

View file

@ -25,11 +25,10 @@
(require 'ert)
(require 'em-basic)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:

View file

@ -30,11 +30,10 @@
(require 'em-hist)
(require 'em-tramp)
(require 'em-unix)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)

View file

@ -27,11 +27,10 @@
(require 'esh-mode)
(require 'eshell)
(require 'em-dirs)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:

View file

@ -27,11 +27,10 @@
(require 'cl-lib)
(require 'ert)
(require 'ert-x)
(require 'ert-x)
(require 'em-extpipe)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defmacro em-extpipe-tests--deftest (name input &rest body)
(declare (indent 2))

View file

@ -25,12 +25,11 @@
(require 'tramp)
(require 'ert)
(require 'ert-x)
(require 'em-glob)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-prefer-lisp-functions)

View file

@ -26,11 +26,10 @@
(require 'ert-x)
(require 'em-hist)
(require 'eshell)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(cl-defun em-hist-test/check-history-file (file-name expected &optional
(expected-ring t))

View file

@ -28,11 +28,10 @@
(require 'eshell)
(require 'em-glob)
(require 'em-pred)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)

View file

@ -26,11 +26,10 @@
(require 'ert)
(require 'eshell)
(require 'em-prompt)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defmacro em-prompt-test--with-multiline (&rest body)
"Execute BODY with a multiline Eshell prompt."

View file

@ -28,11 +28,10 @@
(require 'esh-mode)
(require 'eshell)
(require 'em-script)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-execute-file-output)

View file

@ -30,8 +30,9 @@
(defvar this-directory (file-name-directory
(or load-file-name default-directory))))
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers" this-directory))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:

View file

@ -26,11 +26,10 @@
(require 'ert)
(require 'esh-mode)
(require 'eshell)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)

View file

@ -26,11 +26,10 @@
(require 'ert)
(require 'esh-mode)
(require 'eshell)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)

View file

@ -28,11 +28,10 @@
(require 'esh-mode)
(require 'esh-ext)
(require 'eshell)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:

View file

@ -23,11 +23,10 @@
(require 'ert-x)
(require 'esh-mode)
(require 'eshell)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)

View file

@ -28,11 +28,10 @@
(require 'eshell)
(require 'em-banner)
(require 'em-prompt)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:

View file

@ -24,11 +24,10 @@
(require 'esh-mode)
(require 'eshell)
(require 'em-prompt) ; For `eshell-previous-prompt'
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar esh-proc-test--output-cmd
(concat "sh -c '"

View file

@ -22,11 +22,10 @@
(require 'tramp)
(require 'ert)
(require 'esh-util)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
;;; Tests:

View file

@ -28,11 +28,10 @@
(require 'esh-mode)
(require 'esh-var)
(require 'eshell)
(require 'ert-x)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(defvar eshell-test-begin nil)

View file

@ -28,11 +28,10 @@
(require 'ert)
(require 'ert-x)
(require 'esh-mode)
(require 'ert-x)
(require 'eshell)
(require 'eshell-tests-helpers
(expand-file-name "eshell-tests-helpers"
(file-name-directory (or load-file-name
default-directory))))
(ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(defvar eshell-command-output)