diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-06-07 09:03:59 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-06-07 09:03:59 -0700 |
| commit | fa6d56529f9ebaedaf62ecbf8887ffecca7dce12 (patch) | |
| tree | 922e12ffbf813534647a96788b9a5fb77b4f2288 /test/lisp/emacs-lisp | |
| parent | 6cb557e7a58d7f1c2e9afceeba45d0ced2aff214 (diff) | |
| parent | 35661ef943d261f6c43e93e475ddd8516f4a4b62 (diff) | |
| download | emacs-fa6d56529f9ebaedaf62ecbf8887ffecca7dce12.tar.gz emacs-fa6d56529f9ebaedaf62ecbf8887ffecca7dce12.tar.bz2 emacs-fa6d56529f9ebaedaf62ecbf8887ffecca7dce12.zip | |
Merge from origin/emacs-27
35661ef943 (origin/emacs-27) Fix typo in "(elisp) Type Keywords"
1af0e95fec Gnus nnir-summary-line-format has no effect
dd366b5d3b Improve documentation of 'window-text-pixel-size'
fbd49f969e * src/xdisp.c (Fwindow_text_pixel_size): Doc fix. (Bug#41...
d8593fd19f Minor improvements to EDE and EIEIO manuals
3916e63f9e Have Fido mode also imitate Ido mode in ignore-case options
cc35b197c7 Update package-menu-quick-help
bf09106256 Improve documentation of 'sort-subr'
73749efa13 Update Ukrainian transliteration
30a7ee505a Fix Arabic shaping when eww/shr fill the text to be rendered
7d323f07c0 Silence some byte-compiler warnings in tests
cf473e742f * test/lisp/battery-tests.el: New file.
b07e3b1d97 Improve format-spec documentation (bug#41571)
# Conflicts:
# test/lisp/emacs-lisp/package-tests.el
Diffstat (limited to 'test/lisp/emacs-lisp')
| -rw-r--r-- | test/lisp/emacs-lisp/cl-generic-tests.el | 8 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/package-tests.el | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/cl-generic-tests.el b/test/lisp/emacs-lisp/cl-generic-tests.el index d9f1cb9ec43..51c9884ddc8 100644 --- a/test/lisp/emacs-lisp/cl-generic-tests.el +++ b/test/lisp/emacs-lisp/cl-generic-tests.el @@ -23,9 +23,15 @@ ;;; Code: -(eval-when-compile (require 'ert)) ;Don't indirectly require cl-lib at run-time. (require 'cl-generic) +;; Don't indirectly require `cl-lib' at run-time. +(eval-when-compile (require 'ert)) +(declare-function ert--should-signal-hook "ert") +(declare-function ert--signal-should-execution "ert") +(declare-function ert-fail "ert") +(declare-function ert-set-test "ert") + (fmakunbound 'cl--generic-1) (cl-defgeneric cl--generic-1 (x y)) (cl-defgeneric (setf cl--generic-1) (v y z) "My generic doc.") diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el index 732bf5e061f..90714af3061 100644 --- a/test/lisp/emacs-lisp/package-tests.el +++ b/test/lisp/emacs-lisp/package-tests.el @@ -267,6 +267,9 @@ Must called from within a `tar-mode' buffer." (should (package-installed-p 'simple-single)) (should (package-installed-p 'simple-depend)))) +(declare-function macro-problem-func "macro-problem" ()) +(declare-function macro-problem-10-and-90 "macro-problem" ()) + (ert-deftest package-test-macro-compilation () "Install a package which includes a dependency." (with-package-test (:basedir "package-resources") @@ -616,6 +619,8 @@ Must called from within a `tar-mode' buffer." (let ((process-environment (cons (concat "HOME=" homedir) process-environment))) + (require 'epg-config) + (defvar epg-config--program-alist) (epg-find-configuration 'OpenPGP nil ;; By default we require gpg2 2.1+ due to some |