From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 30 Sep 2017 12:26:58 +0000 (+0200)
Subject: patch 8.0.1162: shared script for tests cannot be included twice
X-Git-Tag: v8.0.1162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997;p=thirdparty%2Fvim.git

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
index 61c3472b2a..189cd82d12 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 f57dd73ef3..cc5c10e985 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 768eeade8c..c8b25c63b5 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
diff --git a/src/version.c b/src/version.c
index 804f84c686..778046b953 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1162,
 /**/
     1161,
 /**/