summaryrefslogtreecommitdiff
path: root/test/Makefile.in
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2021-01-08 21:40:45 +0100
committerAndrea Corallo <akrl@sdf.org>2021-01-08 21:40:45 +0100
commit400f620f24b90540f71673a998c41327237330be (patch)
tree2e94333ffc6ac99987f74833bafe3191eb83c4ed /test/Makefile.in
parent213b5d73159cafbdd52b9c0fb0479544cca98a77 (diff)
parenta31bfd594523dc06941ceb89cdbeabcd4a5d19f7 (diff)
downloademacs-400f620f24b90540f71673a998c41327237330be.tar.gz
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'test/Makefile.in')
-rw-r--r--test/Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index d89ba821168..68ad1a35796 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -168,11 +168,15 @@ endif
## Save logs, and show logs for failed tests.
WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; }
+## On Hydra or Emba, always show logs for certain problematic tests.
ifdef EMACS_HYDRA_CI
-## On Hydra, always show logs for certain problematic tests.
lisp/net/tramp-tests.log \
: WRITE_LOG = 2>&1 | tee $@
endif
+ifdef EMACS_EMBA_CI
+lisp/filenotify-tests.log lisp/net/tramp-tests.log \
+: WRITE_LOG = 2>&1 | tee $@
+endif
ifeq ($(TEST_LOAD_EL), yes)
testloadfile = $*.el