diff options
| author | Glenn Morris | 2017-05-30 14:16:35 -0400 |
|---|---|---|
| committer | Glenn Morris | 2017-05-30 14:16:35 -0400 |
| commit | dd5b1c0d68a93d5bc6659c45a3f8f5028885edf8 (patch) | |
| tree | fd8828053461cf64527c1672878eae582defc5c8 /test | |
| parent | f8f58fe37ee932996f61b4c568512cc5dfc4e3fa (diff) | |
| download | emacs-dd5b1c0d68a93d5bc6659c45a3f8f5028885edf8.tar.gz emacs-dd5b1c0d68a93d5bc6659c45a3f8f5028885edf8.zip | |
Make "make check" less verbose by default
* test/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_ELC, am__v_ELC_)
(am__v_ELC_0, am__v_ELC_1, AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0, am__v_at_1):
New, copied from lisp/Makefile.in.
(%.elc, %.log): Simplify and quieten.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index d13288b895c..8880ee21936 100644 --- a/test/Makefile.in +++ b/test/Makefile.in | |||
| @@ -38,6 +38,26 @@ MKDIR_P = @MKDIR_P@ | |||
| 38 | 38 | ||
| 39 | SEPCHAR = @SEPCHAR@ | 39 | SEPCHAR = @SEPCHAR@ |
| 40 | 40 | ||
| 41 | |||
| 42 | # 'make' verbosity. | ||
| 43 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
| 44 | |||
| 45 | AM_V_ELC = $(am__v_ELC_@AM_V@) | ||
| 46 | am__v_ELC_ = $(am__v_ELC_@AM_DEFAULT_V@) | ||
| 47 | am__v_ELC_0 = @echo " ELC " $@; | ||
| 48 | am__v_ELC_1 = | ||
| 49 | |||
| 50 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
| 51 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
| 52 | am__v_GEN_0 = @echo " GEN " $@; | ||
| 53 | am__v_GEN_1 = | ||
| 54 | |||
| 55 | AM_V_at = $(am__v_at_@AM_V@) | ||
| 56 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
| 57 | am__v_at_0 = @ | ||
| 58 | am__v_at_1 = | ||
| 59 | |||
| 60 | |||
| 41 | # We never change directory before running Emacs, so a relative file | 61 | # We never change directory before running Emacs, so a relative file |
| 42 | # name is fine, and makes life easier. If we need to change | 62 | # name is fine, and makes life easier. If we need to change |
| 43 | # directory, we can use emacs --chdir. | 63 | # directory, we can use emacs --chdir. |
| @@ -72,8 +92,7 @@ emacs = EMACSLOADPATH= LC_ALL=$(TEST_LOCALE) \ | |||
| 72 | all: check | 92 | all: check |
| 73 | 93 | ||
| 74 | %.elc: %.el | 94 | %.elc: %.el |
| 75 | @echo Compiling $< | 95 | $(AM_V_ELC)$(emacs) -f batch-byte-compile $< |
| 76 | @$(emacs) -f batch-byte-compile $< | ||
| 77 | 96 | ||
| 78 | ## Ignore any test errors so we can continue to test other files. | 97 | ## Ignore any test errors so we can continue to test other files. |
| 79 | ## But compilation errors are always fatal. | 98 | ## But compilation errors are always fatal. |
| @@ -114,15 +133,10 @@ endif | |||
| 114 | 133 | ||
| 115 | ## Beware: it approximates 'no-byte-compile', so watch out for false-positives! | 134 | ## Beware: it approximates 'no-byte-compile', so watch out for false-positives! |
| 116 | %.log: %.el | 135 | %.log: %.el |
| 117 | elc=$<c; \ | 136 | $(AM_V_at)grep '^;.*no-byte-compile: t' $< > /dev/null || ${MAKE} $<c |
| 118 | if ! grep '^;.*no-byte-compile: t' $< > /dev/null; then \ | 137 | $(AM_V_at)${MKDIR_P} $(dir $@) |
| 119 | ${MAKE} $$elc; \ | 138 | $(AM_V_GEN)stat=OK ; \ |
| 120 | fi; \ | 139 | HOME=/nonexistent $(emacs) -l ert -l $< \ |
| 121 | loadfile=$<; \ | ||
| 122 | echo Testing $$loadfile; \ | ||
| 123 | stat=OK ; \ | ||
| 124 | ${MKDIR_P} $(dir $@) ; \ | ||
| 125 | HOME=/nonexistent $(emacs) -l ert -l $$loadfile \ | ||
| 126 | --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG} | 140 | --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG} |
| 127 | 141 | ||
| 128 | ifeq (@HAVE_MODULES@, yes) | 142 | ifeq (@HAVE_MODULES@, yes) |