diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /test/Makefile.in | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'test/Makefile.in')
| -rw-r--r-- | test/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 414eca90564..ba823ec7e32 100644 --- a/test/Makefile.in +++ b/test/Makefile.in | |||
| @@ -136,7 +136,8 @@ endif | |||
| 136 | $(AM_V_ELC)$(emacs) -f batch-byte-compile $< | 136 | $(AM_V_ELC)$(emacs) -f batch-byte-compile $< |
| 137 | 137 | ||
| 138 | ## Save logs, and show logs for failed tests. | 138 | ## Save logs, and show logs for failed tests. |
| 139 | WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; } | 139 | WRITE_LOG = $(if $(and ${EMACS_HYDRA_CI}, $(findstring tramp, $@)), |& tee $@, > $@ 2>&1) \ |
| 140 | || { STAT=$$?; cat $@; exit $$STAT; } | ||
| 140 | 141 | ||
| 141 | ifeq ($(TEST_LOAD_EL), yes) | 142 | ifeq ($(TEST_LOAD_EL), yes) |
| 142 | testloadfile = $*.el | 143 | testloadfile = $*.el |