summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2016-01-05 09:47:41 +0100
committerMichael Albinus <michael.albinus@gmx.de>2016-01-05 09:47:41 +0100
commitf5c762c8785523a2d38088aa48452bffa4da69d6 (patch)
treed23f15de5a03de7500187468e25c6ee98b45c950 /test
parent1729cf3eb5a37affcac185bea66b203f9ff0fa8e (diff)
downloademacs-f5c762c8785523a2d38088aa48452bffa4da69d6.tar.gz
Additional changes for "make check-expensive"
* CONTRIBUTE : Encourage use of ":tags '(:expensive-test)". Explain make target `check-expensive'. * etc/NEWS: Mention new make target `check-expensive'. * test/automated/Makefile.in (check-doit): New target. (check, check-expensive): Use it.
Diffstat (limited to 'test')
-rw-r--r--test/automated/Makefile.in20
1 files changed, 12 insertions, 8 deletions
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 43e3905dce5..48920efe12e 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -87,9 +87,9 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
## to change this; bug#17848 - if that gets done, this can be simplified).
##
## Beware: it approximates 'no-byte-compile', so watch out for false-positives!
-SELECTOR_DEFAULT=(not (tag :expensive-test))
+SELECTOR_DEFAULT=(quote (not (tag :expensive-test)))
SELECTOR_EXPENSIVE=nil
-SELECTOR=${SELECTOR_DEFAULT}
+SELECTOR=
%.log: ${srcdir}/%.el
@if grep '^;.*no-byte-compile: t' $< > /dev/null; then \
loadfile=$<; \
@@ -100,7 +100,7 @@ SELECTOR=${SELECTOR_DEFAULT}
echo Testing $$loadfile; \
stat=OK ; \
$(emacs) -l ert -l $$loadfile \
- --eval "(ert-run-tests-batch-and-exit '${SELECTOR})" ${WRITE_LOG}
+ --eval "(ert-run-tests-batch-and-exit ${SELECTOR})" ${WRITE_LOG}
ELFILES = $(sort $(wildcard ${srcdir}/*.el))
LOGFILES = $(patsubst %.el,%.log,$(notdir ${ELFILES}))
@@ -121,16 +121,20 @@ endef
$(foreach test,${TESTS},$(eval $(call test_template,${test})))
-
-## Re-run all the tests every time.
+## Rerun default tests.
check:
- -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
- @${MAKE} check-maybe
+ @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}"
## Rerun also expensive tests.
.PHONY: check-expensive
check-expensive:
- @${MAKE} check SELECTOR=${SELECTOR_EXPENSIVE}
+ @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}"
+
+## Re-run all the tests every time.
+.PHONY: check-doit
+check-doit:
+ -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
+ @${MAKE} check-maybe
## Only re-run tests whose .log is older than the test.
.PHONY: check-maybe