From f6e020b1225970d95e6848b79066f82d9e65b66c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 12 Jun 2020 20:11:55 +0200
Subject: patch 8.2.0962: terminal test sometimes hangs on Travis

Problem:    Terminal test sometimes hangs on Travis.
Solution:   Do show output for this test temporarily.
---
 src/testdir/Makefile | 8 ++++++++
 src/version.c        | 2 ++
 2 files changed, 10 insertions(+)

(limited to 'src')

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 7f9ef04342..29efa0fe0e 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -168,6 +168,14 @@ newtestssilent: $(NEW_TESTS_RES)
 	$(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim $(REDIR_TEST_TO_NULL)
 	@rm vimcmd
 
+# Temporary: Do not use $REDIR_TEST_TO_NULL for test_terminal to be able to see
+# where it sometimes hanges on CI.
+test_terminal.res: test_terminal.vim
+	@echo "$(VIMPROG)" > vimcmd
+	@echo "$(RUN_VIMTEST)" >> vimcmd
+	$(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim
+	@rm vimcmd
+
 test_gui.res: test_gui.vim
 	@echo "$(VIMPROG)" > vimcmd
 	@echo "$(RUN_GVIMTEST)" >> vimcmd
diff --git a/src/version.c b/src/version.c
index 93f940b222..8c8efd256b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    962,
 /**/
     961,
 /**/
-- 
cgit v1.2.3