[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 354a1fc: make check unconditional, check-maybe top-
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] master 354a1fc: make check unconditional, check-maybe top-level. |
Date: |
Wed, 02 Dec 2015 21:30:58 +0000 |
branch: master
commit 354a1fc38d6d4bf93db30c6e3048437dd3fbc19f
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
make check unconditional, check-maybe top-level.
* Makefile.in: Add check-maybe target.
* test/Makefile.in: Restore unconditional behaviour to make check.
---
Makefile.in | 11 ++++++++++-
test/Makefile.in | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 9ab1f76..06e5b06 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -921,6 +921,15 @@ extraclean: $(extraclean_dirs:=_extraclean)
TAGS tags: lib lib-src src
$(MAKE) -C src tags
+
+check-maybe: all
+ @if test ! -d test; then \
+ echo "You do not seem to have the test/ directory."; \
+ echo "Maybe you are using a release tarfile, rather than a repository
checkout."; \
+ else \
+ $(MAKE) -C test check-maybe; \
+ fi
+
check: all
@if test ! -d test; then \
echo "You do not seem to have the test/ directory."; \
@@ -943,7 +952,7 @@ $(DOCS):
$(MAKE) -C doc/$(subst -, ,$@)
.PHONY: $(DOCS) docs pdf ps
-.PHONY: info dvi dist check html info-real info-dir check-info
+.PHONY: info dvi dist check check-maybe html info-real info-dir check-info
## TODO add etc/refcards.
docs: $(DOCS)
diff --git a/test/Makefile.in b/test/Makefile.in
index 06a2fb9..1e76675 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -136,7 +136,7 @@ $(foreach test,${TESTS},$(eval $(call
test_template,${test})))
## Re-run all the tests every time.
check:
- address@hidden f in *.log; do test ! -f $$f || mv $$f $$f~; done
+ address@hidden f in $(LOGFILES); do test ! -f $$f || mv $$f $$f~; done
@${MAKE} check-maybe
## Only re-run tests whose .log is older than the test.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 354a1fc: make check unconditional, check-maybe top-level.,
Phillip Lord <=