diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-02-22 03:18:13 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-02-22 03:18:13 +0100 |
| commit | 2312775928e556acc42b2b4fac2aced009533914 (patch) | |
| tree | 49b9a34d4737f34934a523c0d5868d30244bdd8b /test/Makefile.in | |
| parent | 993e8b010c98d017d74a7ba22c9fb9549a6d5d75 (diff) | |
| download | emacs-2312775928e556acc42b2b4fac2aced009533914.tar.gz | |
Remove the ELPA dependencies from test/Makefile.in
* test/Makefile.in: Remove the ELPA dependencies, because it's
pretty confusing when trying to debug things.
* test/README (SELECTOR): Remove mention of the now-removed
GNU_ELPA_DIRECTORY variable.
* test/lisp/net/ntlm-tests.el (push): Add the ELPA dependencies
here, which keeps it contained to one test file. This also fixes
bug#53586, since the obsoletion of `body' came from web-server.el.
Diffstat (limited to 'test/Makefile.in')
| -rw-r--r-- | test/Makefile.in | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index bc315ac4b3a..708c4b2fb0f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -53,15 +53,6 @@ REPLACE_FREE = @REPLACE_FREE@ -include ${top_builddir}/src/verbose.mk -# Load any GNU ELPA dependencies that are present, for optional tests. -GNU_ELPA_DIRECTORY ?= $(srcdir)/../../elpa -# Keep elpa_dependencies dependency-ordered. -elpa_dependencies = \ - url-http-ntlm/url-http-ntlm.el \ - web-server/web-server.el -elpa_els = $(addprefix $(GNU_ELPA_DIRECTORY)/packages/,$(elpa_dependencies)) -elpa_opts = $(foreach el,$(elpa_els),$(and $(wildcard $(el)),-L $(dir $(el)) -l $(el))) - # We never change directory before running Emacs, so a relative file # name is fine, and makes life easier. If we need to change # directory, we can use emacs --chdir. @@ -72,7 +63,7 @@ EMACS_EXTRAOPT = # Command line flags for Emacs. # Apparently MSYS bash would convert "-L :" to "-L ;" anyway, # but we might as well be explicit. -EMACSOPT = --no-init-file --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(elpa_opts) $(EMACS_EXTRAOPT) +EMACSOPT = --no-init-file --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(EMACS_EXTRAOPT) # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH GREP_OPTIONS XDG_CONFIG_HOME @@ -101,7 +92,7 @@ export TEST_LOAD_EL ?= \ $(if $(findstring $(MAKECMDGOALS), all check check-maybe),no,yes) # Additional settings for ert. -ert_opts += $(elpa_opts) +ert_opts = # Maximum length of lines in ert backtraces; nil for no limit. # (if empty, use the default ert-batch-backtrace-right-margin). |