Additional changes for "make check-expensive"

[gnu-emacs] / test / automated / Makefile.in

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 43e3905dce576f46564bcc495775ee3186d6c35e..48920efe12e5a064b106df5757e9cc0ca08931bc 100644 (file)
--- 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