From 660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 30 Sep 2017 14:26:58 +0200 Subject: 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. --- src/testdir/test_alot.vim | 2 -- src/testdir/test_bufline.vim | 4 +--- src/testdir/test_timers.vim | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/testdir') diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index 61c3472b2..189cd82d1 100644 --- 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 index f57dd73ef..cc5c10e98 100644 --- 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 index 768eeade8..c8b25c63b 100644 --- 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 -- cgit v1.2.3