summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/Makefile8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 7f9ef0434..29efa0fe0 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 93f940b22..8c8efd256 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 962,
+/**/
961,
/**/
960,