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 a338169852553d1b92b5875aa855134f6d028d14..feb8ce37b852e33cda3435e4cd9df51687022bb0 100644 (file)
--- 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 9025f83eaa6f4d0551855b00a9036a7ee994eff3..810dc5fc27154f51fc9c52cc9b141b220fa2a16b 100644 (file)
--- 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 76476bcf48327b67a7deef2e9ac7cdbd2a2b189a..c7f8764137eb5a1be9fa2f0a4c6c9d9513bc9d5d 100644 (file)
--- 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,
 /**/