changeset 12473:27c5d8954231 v8.0.1116

patch 8.0.1116: terminal test fails on MS-Windows commit https://github.com/vim/vim/commit/1514e8f4271d0039740b968a9f7d0d7f81a262a2 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 16 17:35:13 2017 +0200 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 https://github.com/vim/vim/issues/2097)
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Sep 2017 17:45:04 +0200
parents 9034be9808f8
children 6d968a4c1c9c
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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))
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1116,
+/**/
     1115,
 /**/
     1114,