check-maybe shall run only default tests

* test/automated/Makefile.in (check, check-expensive): Depend on
mostlyclean.
(check-maybe): Re-run only default tests.
(check-doit): Use code of check-maybe.
(mostlyclean): Move *.log files away.

1 files changed, 18 insertions, 16 deletions

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 48920efe12e..152e601270e 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=(quote (not (tag :expensive-test)))
-SELECTOR_EXPENSIVE=nil
-SELECTOR=
+SELECTOR_DEFAULT = (quote (not (tag :expensive-test)))
+SELECTOR_EXPENSIVE = nil
+SELECTOR =
 %.log: ${srcdir}/%.el
         @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \
           loadfile=$<; \
@@ -121,29 +121,31 @@ endef
 
 $(foreach test,${TESTS},$(eval $(call test_template,${test})))
 
-## Rerun default tests.
-check:
+## Rerun all default tests.
+check: mostlyclean
         @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}"
 
-## Rerun also expensive tests.
+## Rerun all default and expensive tests.
 .PHONY: check-expensive
-check-expensive:
+check-expensive: mostlyclean
         @${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.
+## Only re-run default tests whose .log is older than the test.
 .PHONY: check-maybe
-check-maybe: ${LOGFILES}
+check-maybe:
+        @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}"
+
+## Run the tests.
+.PHONY: check-doit
+check-doit: ${LOGFILES}
         $(emacs) -l ert -f ert-summarize-tests-batch-and-exit $^
 
 .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
 
-clean mostlyclean:
+mostlyclean:
+        -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
+
+clean:
         -rm -f *.log *.log~
 
 bootstrap-clean: clean