[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/multi-level-test-makefile 7f9bd59 5/6: Use srcdir
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] scratch/multi-level-test-makefile 7f9bd59 5/6: Use srcdir when appropriate and not elsewhere. |
Date: |
Fri, 06 Nov 2015 23:21:37 +0000 |
branch: scratch/multi-level-test-makefile
commit 7f9bd5925cde845a0f793c15a8b403c4d835e858
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Use srcdir when appropriate and not elsewhere.
---
test/automated/Makefile.in | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 3d4e499..81ae851 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -102,12 +102,7 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo
$$stat: $@
ELFILES = $(sort $(wildcard ${srcdir}/*.el) $(wildcard ${srcdir}/*/*.el) \
$(wildcard ${srcdir}/*/*/*.el))
LOGFILES = $(patsubst %.el,%.log,${ELFILES})
-TESTS = ${LOGFILES:.log=}
-
-ping:
- echo elfiles $(ELFILES)
- echo logfiles $(LOGFILES)
- echo tests $(TESTS)
+TESTS = $(subst ${srcdir}/,,$(LOGFILES:.log=))
## If we have to interrupt a hanging test, preserve the log so we can
## see what the problem was.
@@ -118,11 +113,10 @@ ping:
## The short aliases that always re-run the tests, with no logging.
define test_template
$(1):
- @test ! -f $(1).log || mv $(1).log $(1).log~
- @${MAKE} $(1).log WRITE_LOG=
+ @test ! -f ${srcdir}/$(1).log || mv ${srcdir}/$(1).log
${srcdir}/$(1).log~
+ @${MAKE} ${srcdir}/$(1).log WRITE_LOG=
endef
-$(foreach test,${TESTS},$(info $(call test_template,${test})))
$(foreach test,${TESTS},$(eval $(call test_template,${test})))
- [Emacs-diffs] branch scratch/multi-level-test-makefile created (now b5b7c59), Phillip Lord, 2015/11/06
- [Emacs-diffs] scratch/multi-level-test-makefile bb955f7 1/6: Initial commit., Phillip Lord, 2015/11/06
- [Emacs-diffs] scratch/multi-level-test-makefile e3f62ce 3/6: Test (test) subdirs added., Phillip Lord, 2015/11/06
- [Emacs-diffs] scratch/multi-level-test-makefile 00fce5f 4/6: Change wildcards to match recursive directories., Phillip Lord, 2015/11/06
- [Emacs-diffs] scratch/multi-level-test-makefile 99bd67d 2/6: Some copy paths added to script. Playing with makefile., Phillip Lord, 2015/11/06
- [Emacs-diffs] scratch/multi-level-test-makefile 7f9bd59 5/6: Use srcdir when appropriate and not elsewhere.,
Phillip Lord <=
- [Emacs-diffs] scratch/multi-level-test-makefile b5b7c59 6/6: Updated location spec for C. Added more files., Phillip Lord, 2015/11/06