Skip to content

Commit 660b85e

Browse files
committed
patch 8.0.1162: shared script for tests cannot be included twice
Problem: Shared script for tests cannot be included twice. Solution: Include it where needed, it will "finish" if loaded again.
1 parent a5e6621 commit 660b85e

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

src/testdir/test_alot.vim

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
" A series of tests that can run in one Vim invocation.
22
" This makes testing go faster, since Vim doesn't need to restart.
33

4-
source shared.vim
5-
64
set belloff=all
75
source test_assign.vim
86
source test_bufline.vim

src/testdir/test_bufline.vim

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
" Tests for setbufline() and getbufline()
22

3-
if !exists('*GetVimCommand')
4-
source shared.vim
5-
endif
3+
source shared.vim
64

75
func Test_setbufline_getbufline()
86
new

src/testdir/test_timers.vim

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ if !has('timers')
44
finish
55
endif
66

7-
if !exists('*WaitFor')
8-
source shared.vim
9-
endif
7+
source shared.vim
108

119
func MyHandler(timer)
1210
let g:val += 1

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1162,
764766
/**/
765767
1161,
766768
/**/

0 commit comments

Comments
 (0)