From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 14 Sep 2019 19:23:40 +0000 (+0200)
Subject: patch 8.1.2030: tests fail when build with normal features and terminal
X-Git-Tag: v8.1.2030
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=997d42427eaab889058eb047e08d55de9e4a968a;p=vim

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
index a33816985..feb8ce37b 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 9025f83ea..810dc5fc2 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 76476bcf4..c7f876413 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2030,
 /**/
     2029,
 /**/