summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-11 14:04:28 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-11 14:04:28 +0200
commitf65927fc8d0102ef2d0fea776381caedf4c51e32 (patch)
treec1c83cb7e90bb9f8c507881d5339385e9ed40058
parentb074e8b8d4d3cefefc675dfaf3982d388ee07772 (diff)
downloadvim-git-f65927fc8d0102ef2d0fea776381caedf4c51e32.tar.gz
patch 8.2.1179: Test_termwinscroll() sometimes hangs in the GUIv8.2.1179
Problem: Test_termwinscroll() sometimes hangs in the GUI. Solution: Skip the test in the GUI.
-rw-r--r--src/testdir/test_terminal2.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim
index d89b97522..c1b38d2d2 100644
--- a/src/testdir/test_terminal2.vim
+++ b/src/testdir/test_terminal2.vim
@@ -184,6 +184,8 @@ endfunc
func Test_termwinscroll()
CheckUnix
+ " TODO: Somehow this test sometimes hangs in the GUI
+ CheckNotGui
" Let the terminal output more than 'termwinscroll' lines, some at the start
" will be dropped.
diff --git a/src/version.c b/src/version.c
index c01d1059d..0d2681436 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 */
/**/
+ 1179,
+/**/
1178,
/**/
1177,