patch 8.0.1116: terminal test fails on MS-Windows

Problem:    Terminal test fails on MS-Windows.
Solution:   Wait for the text to appear. (micbou, closes #2097)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 4a639bd87cd557f1b9f7cac2d5f05779816f28c4..96edf41ca44dc9acfdb4db0f143f468bc37c1c03 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -634,7 +634,8 @@ func TerminalTmap(remap)
   call assert_equal('456', maparg('123', 't'))
   call assert_equal('abcde', maparg('456', 't'))
   call feedkeys("123", 'tx')
-  call term_wait(buf)
+  let g:buf = buf
+  call WaitFor("term_getline(g:buf,term_getcursor(g:buf)[0]) =~ 'abcde\\|456'")
   let lnum = term_getcursor(buf)[0]
   if a:remap
     call assert_match('abcde', term_getline(buf, lnum))

diff --git a/src/version.c b/src/version.c
index 8b777e7e171b18d710b28e0c85044ee167e16119..ba32ecbc5d5e805019a85405fa880ed88adb746b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1116,
 /**/
     1115,
 /**/