summaryrefslogtreecommitdiff
path: root/test/Makefile.in
diff options
context:
space:
mode:
authorPhillip Lord <phillip.lord@russet.org.uk>2015-11-27 21:41:14 +0000
committerPhillip Lord <phillip.lord@russet.org.uk>2015-11-27 21:41:14 +0000
commit82ef79c27829e60184340d9c57f870da450312a0 (patch)
tree460cb1de508a8a8ad2e13be09550b2fc96180260 /test/Makefile.in
parent6625890e7c2a259407819d6c287c882eabe23ba8 (diff)
downloademacs-82ef79c27829e60184340d9c57f870da450312a0.tar.gz
Exclude resource dirs from search for tests.
* test/Makefile.in: Test file locations are now found with find rather than using finds native functions.
Diffstat (limited to 'test/Makefile.in')
-rw-r--r--test/Makefile.in13
1 files changed, 6 insertions, 7 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 545a0e110fb..d3a8eb90420 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -99,10 +99,11 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
$(emacs) -l ert -l $$loadfile \
-f ert-run-tests-batch-and-exit ${WRITE_LOG}
-ELFILES = $(filter-out ./manual%,\
- $(sort $(wildcard ${srcdir}/*.el) $(wildcard ${srcdir}/*/*.el) \
- $(wildcard ${srcdir}/*/*/*.el) $(wildcard ${srcdir}/*/*/*/*.el)))
+ELFILES = $(shell find ${srcdir} -path "./manual" -prune -o \
+ -path "*resources" -prune -o -name "*el" -print)
+ELCFILES = $(patsubst %.el,%.elc,${ELFILES})
LOGFILES = $(patsubst %.el,%.log,${ELFILES})
+LOGSAVEFILES = $(patsubst %.el,%.log~,${ELFILES})
TESTS = $(subst ${srcdir}/,,$(LOGFILES:.log=))
## If we have to interrupt a hanging test, preserve the log so we can
@@ -138,12 +139,10 @@ check-maybe: ${LOGFILES}
.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
clean mostlyclean:
- -rm -f ${srcdir}/*.log ${srcdir}/*.log~ ${srcdir}/*/*.log \
- ${srcdir}/*/*.log~ ${srcdir}/*/*/*.log \
- ${srcdir}/*/*/*.log~
+ -rm -f ${LOGFILES} ${LOGSAVEFILES}
bootstrap-clean: clean
- -rm -f ${srcdir}/*.elc ${srcdir}/*/*.elc ${srcdir}/*/*/*.elc
+ -rm -f ${ELCFILES}
distclean: clean
rm -f Makefile