diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-14 21:23:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-14 21:23:40 +0200 |
| commit | 997d42427eaab889058eb047e08d55de9e4a968a (patch) | |
| tree | cd50c48ceb23550790ff73fe0091f2a35f04e215 | |
| parent | 017ba07fa2cdc578245618717229444fd50c470d (diff) | |
patch 8.1.2030: tests fail when build with normal features and terminalv8.1.2030
Problem: Tests fail when build with normal features and terminal.
(Dominique Pelle)
Solution: Disable tests that won't work. (closes #4932)
| -rw-r--r-- | src/testdir/test_popupwin.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index a338169852..feb8ce37b8 100644 --- 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 index 9025f83eaa..810dc5fc27 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1684,12 +1684,14 @@ func Test_terminal_termwinkey() call feedkeys("\<C-W>w", 'tx') call assert_equal(termwin, win_getid()) - set langmap=xjyk - call feedkeys("\<C-L>x", 'tx') - call assert_equal(thiswin, win_getid()) - call feedkeys("\<C-W>y", 'tx') - call assert_equal(termwin, win_getid()) - set langmap= + if has('langmap') + set langmap=xjyk + call feedkeys("\<C-L>x", 'tx') + call assert_equal(thiswin, win_getid()) + call feedkeys("\<C-W>y", 'tx') + call assert_equal(termwin, win_getid()) + set langmap= + endif call feedkeys("\<C-L>gt", "xt") call assert_equal(3, tabpagenr()) diff --git a/src/version.c b/src/version.c index 76476bcf48..c7f8764137 100644 --- 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, |