patch 8.0.1055: bufline test hangs on MS-Windows

Problem:    Bufline test hangs on MS-Windows.
Solution:   Avoid message for writing file.  Source shared.vim when running
            test individually.

diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim
index 2fe6739ed3df8fa0705f7d524f18b7f52d3e35b4..f57dd73ef3f811cca99418f442fb0db9eb7e96cd 100644 (file)
--- a/src/testdir/test_bufline.vim
+++ b/src/testdir/test_bufline.vim
@@ -1,5 +1,9 @@
 " Tests for setbufline() and getbufline()
 
+if !exists('*GetVimCommand')
+  source shared.vim
+endif
+
 func Test_setbufline_getbufline()
   new
   let b = bufnr('%')
@@ -30,7 +34,7 @@ func Test_setline_startup()
   if cmd == ''
     return
   endif
-  call writefile(['call setline(1, "Hello")', 'w Xtest', 'q!'], 'Xscript')
+  call writefile(['call setline(1, "Hello")', 'silent w Xtest', 'q!'], 'Xscript')
   call system(cmd)
   call assert_equal(['Hello'], readfile('Xtest'))
 

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 142bfc8a54eb2f8ebad2fa136d813ee543d81b54..c9171b7b961c7fb161103cda00537332ad2a1fd4 100644 (file)
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -4,6 +4,10 @@ if !has('timers')
   finish
 endif
 
+if !exists('*WaitFor')
+  source shared.vim
+endif
+
 func MyHandler(timer)
   let g:val += 1
 endfunc

diff --git a/src/version.c b/src/version.c
index 7f7002c8a459083f578a2f9016de5d3c114621a7..d15565f0ad807f40b764bc0def6b88ccc5a01c2d 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 */
+/**/
+    1055,
 /**/
     1054,
 /**/