[Emacs-diffs] master 82ef79c: Exclude resource dirs from search for tests.

[Phillip Lord]

branch: master
commit 82ef79c27829e60184340d9c57f870da450312a0
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>

    Exclude resource dirs from search for tests.
    
    * test/Makefile.in: Test file locations are now found with find
      rather than using finds native functions.
---
 test/Makefile.in |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index 545a0e1..d3a8eb9 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