diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-12 20:11:55 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-12 20:11:55 +0200 |
| commit | f6e020b1225970d95e6848b79066f82d9e65b66c (patch) | |
| tree | 7df6525df5a3dccf1377371dc4ff6e7f94f5d1b5 | |
| parent | ec68028604b6ee799b2ef5fc861ec5163e82914f (diff) | |
| download | vim-git-f6e020b1225970d95e6848b79066f82d9e65b66c.tar.gz | |
patch 8.2.0962: terminal test sometimes hangs on Travisv8.2.0962
Problem: Terminal test sometimes hangs on Travis.
Solution: Do show output for this test temporarily.
| -rw-r--r-- | src/testdir/Makefile | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |