diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-04 22:56:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-04 22:56:01 +0200 |
| commit | 11aa62f8f949bb590b4d7792a334885fba5e4137 (patch) | |
| tree | 56dff83537634b3e6e72019ea7f6282f4380fb84 | |
| parent | 178333783fac3a5edbc86f2e9c57a21c41f05697 (diff) | |
patch 8.0.1055: bufline test hangs on MS-Windowsv8.0.1055
Problem: Bufline test hangs on MS-Windows.
Solution: Avoid message for writing file. Source shared.vim when running
test individually.
| -rw-r--r-- | src/testdir/test_bufline.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_timers.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim index 2fe6739ed3..f57dd73ef3 100644 --- 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 142bfc8a54..c9171b7b96 100644 --- 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 7f7002c8a4..d15565f0ad 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 */ /**/ + 1055, +/**/ 1054, /**/ 1053, |