[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117433: Disable logging in the short form of the te
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117433: Disable logging in the short form of the test Makefile rules |
Date: |
Sat, 28 Jun 2014 17:05:13 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117433
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-06-28 10:05:00 -0700
message:
Disable logging in the short form of the test Makefile rules
* test/automated/Makefile.in (WRITE_LOG): New variable.
(%.log): Use WRITE_LOG.
(test_template): Disable logging.
modified:
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/Makefile.in makefile.in-20110112160650-056hnl9qhpjvjicy-6
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-06-28 01:11:04 +0000
+++ b/test/ChangeLog 2014-06-28 17:05:00 +0000
@@ -1,5 +1,9 @@
2014-06-28 Glenn Morris <address@hidden>
+ * automated/Makefile.in (WRITE_LOG): New variable.
+ (%.log): Use WRITE_LOG.
+ (test_template): Disable logging.
+
* automated/Makefile.in (TESTS): New list of short PHONY aliases.
(test_template): New definition. Apply to TESTS.
=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in 2014-06-28 01:11:04 +0000
+++ b/test/automated/Makefile.in 2014-06-28 17:05:00 +0000
@@ -20,10 +20,10 @@
### Commentary:
## Some targets:
-## check: re-run all tests
+## check: re-run all tests, writing to .log files.
## check-maybe: run all tests whose .log file needs updating
## filename.log: run tests from filename.el(c) if .log file needs updating
-## filename: re-run tests from filename.el(c)
+## filename: re-run tests from filename.el(c), with no logging
### Code:
@@ -60,10 +60,9 @@
@$(emacs) -f batch-byte-compile $<
## Ignore any test errors so we can continue to test other files.
-## (It would be nice if we could get an error when running an
-## individual test, but not when running check.)
## But compilation errors are always fatal.
-##
+WRITE_LOG = >& $@ || { stat=ERROR; cat $@; }; echo $$stat: $@
+
## I'd prefer to use -emacs -f ert-run-tests-batch-and-exit rather
## than || true, since the former makes problems more obvious.
## I'd also prefer to @-hide the grep part and not the
@@ -74,7 +73,7 @@
## basename duplicates a file in lisp/ (eg eshell.el).
## ii) Although -l basename will automatically load .el or .elc,
## -l ./basename treats basename as a literal file (it would be nice
-## to change this).
+## 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!
%.log: ${srcdir}/%.el
@@ -87,10 +86,7 @@
echo Testing $$loadfile; \
stat=OK ; \
$(emacs) -l ert -l $$loadfile \
- -f ert-run-tests-batch-and-exit >& $@ || { \
- stat=ERROR; \
- cat $@; }; \
- echo $$stat: $@
+ -f ert-run-tests-batch-and-exit ${WRITE_LOG}
ELFILES = $(wildcard ${srcdir}/*.el)
LOGFILES = $(patsubst %.el,%.log,$(notdir ${ELFILES}))
@@ -102,11 +98,11 @@
.PHONY: ${TESTS}
-## The short aliases that always re-run the tests.
+## 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
+ @${MAKE} $(1).log WRITE_LOG=
endef
$(foreach test,${TESTS},$(eval $(call test_template,${test})))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117433: Disable logging in the short form of the test Makefile rules,
Glenn Morris <=