changeset 18070:873068e19e1f v8.1.2030

patch 8.1.2030: tests fail when build with normal features and terminal Commit: https://github.com/vim/vim/commit/997d42427eaab889058eb047e08d55de9e4a968a Author: Bram Moolenaar <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 14 Sep 2019 21:30:03 +0200
parents 1f52c157c2e9
children ac2dff806259
files src/testdir/test_popupwin.vim src/testdir/test_terminal.vim src/version.c
diffstat 3 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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))
--- 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())
--- 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,