diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
| commit | cf1e8e792f60949e09e3ad4c53fb61b0b7628229 (patch) | |
| tree | 35080229c9e3b46e5db14a2f051c001ab8c6e586 /test/Makefile.in | |
| parent | 39792cf62987ecc1a772f6a2027d6b32c70e8312 (diff) | |
| parent | d0c47652e527397cae96444c881bf60455c763c1 (diff) | |
| download | emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'test/Makefile.in')
| -rw-r--r-- | test/Makefile.in | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 3b6c18d9410..c7501fa358b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -72,6 +72,15 @@ am__v_at_1 = HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ +# 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. @@ -82,7 +91,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)" $(EMACS_EXTRAOPT) +EMACSOPT = --no-init-file --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(elpa_opts) $(EMACS_EXTRAOPT) # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSPATH GREP_OPTIONS @@ -106,7 +115,7 @@ export TEST_LOAD_EL ?= \ $(if $(findstring $(MAKECMDGOALS), all check check-maybe),no,yes) # Additional settings for ert. -ert_opts = +ert_opts += $(elpa_opts) # Maximum length of lines in ert backtraces; nil for no limit. # (if empty, use the default ert-batch-backtrace-right-margin). @@ -255,7 +264,7 @@ endef $(foreach test,${TESTS},$(eval $(call test_template,${test}))) ## Get the tests for only a specific directory. -SUBDIRS = $(sort $(shell find lib-src lisp src -type d ! -path "*resources*" -print)) +SUBDIRS = $(sort $(shell find lib-src lisp misc src -type d ! -path "*resources*" -print)) define subdir_template .PHONY: check-$(subst /,-,$(1)) |