# HG changeset patch # User Bram Moolenaar # Date 1568489403 -7200 # Node ID 873068e19e1f0bf6180a203c36c5f60c4595287d # Parent 1f52c157c2e9ac35e4e715eb9dbc2074b4573bbb patch 8.1.2030: tests fail when build with normal features and terminal Commit: https://github.com/vim/vim/commit/997d42427eaab889058eb047e08d55de9e4a968a Author: Bram Moolenaar Date: Sat Sep 14 21:23:40 2019 +0200 patch 8.1.2030: tests fail when build with normal features and terminal Problem: Tests fail when build with normal features and terminal. (Dominique Pelle) Solution: Disable tests that won't work. (closes #4932) diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1136,6 +1136,7 @@ endfunc func Test_popup_beval() CheckScreendump + CheckFeature balloon_eval let lines =<< trim END call setline(1, range(1, 20)) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1684,12 +1684,14 @@ func Test_terminal_termwinkey() call feedkeys("\w", 'tx') call assert_equal(termwin, win_getid()) - set langmap=xjyk - call feedkeys("\x", 'tx') - call assert_equal(thiswin, win_getid()) - call feedkeys("\y", 'tx') - call assert_equal(termwin, win_getid()) - set langmap= + if has('langmap') + set langmap=xjyk + call feedkeys("\x", 'tx') + call assert_equal(thiswin, win_getid()) + call feedkeys("\y", 'tx') + call assert_equal(termwin, win_getid()) + set langmap= + endif call feedkeys("\gt", "xt") call assert_equal(3, tabpagenr()) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2030, +/**/ 2029, /**/ 2028,