diff options
| author | Glenn Morris | 2018-02-21 20:49:40 -0500 |
|---|---|---|
| committer | Glenn Morris | 2018-02-21 20:49:40 -0500 |
| commit | 3267763e6ba1787c702a42a131d6e466b1aa42d7 (patch) | |
| tree | 0f456943faa5e17772066450c3763768c7ff70a4 /test | |
| parent | 56161254838e759243ccaab50c80327316a99979 (diff) | |
| download | emacs-3267763e6ba1787c702a42a131d6e466b1aa42d7.tar.gz emacs-3267763e6ba1787c702a42a131d6e466b1aa42d7.zip | |
Speed up parallel make check by testing slower files first
* test/Makefile.in (SLOW_TESTS): New variable.
(ELFILES): Move slow tests to the front.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index a85d491d2d3..1653263e7a4 100644 --- a/test/Makefile.in +++ b/test/Makefile.in | |||
| @@ -96,6 +96,7 @@ TEST_LOCALE = C | |||
| 96 | 96 | ||
| 97 | # Whether to run tests from .el files in preference to .elc, we do | 97 | # Whether to run tests from .el files in preference to .elc, we do |
| 98 | # this by default since it gives nicer stacktraces. | 98 | # this by default since it gives nicer stacktraces. |
| 99 | # If you just want a pass/fail, setting this to no is much faster. | ||
| 99 | TEST_LOAD_EL ?= yes | 100 | TEST_LOAD_EL ?= yes |
| 100 | 101 | ||
| 101 | # Maximum length of lines in ert backtraces; nil for no limit. | 102 | # Maximum length of lines in ert backtraces; nil for no limit. |
| @@ -174,11 +175,18 @@ else | |||
| 174 | maybe_exclude_module_tests := -name emacs-module-tests.el -prune -o | 175 | maybe_exclude_module_tests := -name emacs-module-tests.el -prune -o |
| 175 | endif | 176 | endif |
| 176 | 177 | ||
| 178 | ## To speed up parallel builds, put these slow test files (which can | ||
| 179 | ## take longer than all the rest combined) at the start of the list. | ||
| 180 | SLOW_TESTS = ${srcdir}/lisp/net/tramp-tests.el | ||
| 181 | |||
| 177 | ELFILES := $(sort $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \ | 182 | ELFILES := $(sort $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \ |
| 178 | -path "${srcdir}/data" -prune -o \ | 183 | -path "${srcdir}/data" -prune -o \ |
| 179 | -name "*resources" -prune -o \ | 184 | -name "*resources" -prune -o \ |
| 180 | ${maybe_exclude_module_tests} \ | 185 | ${maybe_exclude_module_tests} \ |
| 181 | -name "*.el" ! -name ".*" -print)) | 186 | -name "*.el" ! -name ".*" -print)) |
| 187 | |||
| 188 | $(foreach slow,${SLOW_TESTS},$(eval ELFILES:= ${slow} $(filter-out ${slow},${ELFILES}))) | ||
| 189 | |||
| 182 | ## .log files may be in a different directory for out of source builds | 190 | ## .log files may be in a different directory for out of source builds |
| 183 | LOGFILES := $(patsubst %.el,%.log, \ | 191 | LOGFILES := $(patsubst %.el,%.log, \ |
| 184 | $(patsubst $(srcdir)/%,%,$(ELFILES))) | 192 | $(patsubst $(srcdir)/%,%,$(ELFILES))) |