# HG changeset patch # User Christian Brabandt # Date 1506774605 -7200 # Node ID 440d934bd6160cf691132512c97294b7aa0905d2 # Parent 0676034468be5fe2d0b0541c7d7ea1afd02bb63b patch 8.0.1162: shared script for tests cannot be included twice commit https://github.com/vim/vim/commit/660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997 Author: Bram Moolenaar Date: Sat Sep 30 14:26:58 2017 +0200 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. diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -1,8 +1,6 @@ " A series of tests that can run in one Vim invocation. " This makes testing go faster, since Vim doesn't need to restart. -source shared.vim - set belloff=all source test_assign.vim source test_bufline.vim diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim --- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -1,8 +1,6 @@ " Tests for setbufline() and getbufline() -if !exists('*GetVimCommand') - source shared.vim -endif +source shared.vim func Test_setbufline_getbufline() new diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -4,9 +4,7 @@ if !has('timers') finish endif -if !exists('*WaitFor') - source shared.vim -endif +source shared.vim func MyHandler(timer) let g:val += 1 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1162, +/**/ 1161, /**/ 1160,