# HG changeset patch # User Bram Moolenaar # Date 1591985704 -7200 # Node ID 3e606a19fa13f2450de05f9d88370a128b209e34 # Parent 0b6db39202d1e01f486ca965bb8e995ed333b963 patch 8.2.0962: terminal test sometimes hangs on Travis Commit: https://github.com/vim/vim/commit/f6e020b1225970d95e6848b79066f82d9e65b66c Author: Bram Moolenaar Date: Fri Jun 12 20:11:55 2020 +0200 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. diff --git a/src/testdir/Makefile b/src/testdir/Makefile --- 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 --- 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,