summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-03 21:08:05 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-03 21:08:05 +0200
commit620d064b0b0bca2268574abdec2d8eac3384cfdf (patch)
tree9f061a3c6b3ab106a0fe34efa60530af451c98cf
parent102dc7f891c43e3065aef4adafdb2c647c5d09d2 (diff)
patch 8.0.0857: terminal test fails on MS-Windowsv8.0.0857
Problem: Terminal test fails on MS-Windows. Solution: Sleep a fraction of a second.
-rw-r--r--src/testdir/test_terminal.vim4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 987b1ee13b..3f5e268b5b 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -152,6 +152,10 @@ func Test_terminal_scrape()
call term_wait(1234)
call term_wait(buf)
+ if has('win32')
+ " TODO: this should not be needed
+ sleep 100m
+ endif
call Check_123(buf)
" Must still work after the job ended.
diff --git a/src/version.c b/src/version.c
index b8d0203275..1c01f4f041 100644
--- 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 */
/**/
+ 857,
+/**/
856,
/**/
855,