commit 660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997
author Bram Moolenaar <Bram@vim.org> Sat Sep 30 14:26:58 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Sep 30 14:26:58 2017 +0200
tree 46cbda71c0d5c384693235d7996c297f43bc3c95
parent a5e6621aadadf78c7b344e93a4b328788076f14c

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

diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 61c3472..189cd82 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

src/testdir/test_bufline.vim

diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim
index f57dd73..cc5c10e 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

src/testdir/test_timers.vim

diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 768eead..c8b25c6 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -4,9 +4,7 @@
   finish
 endif
 
-if !exists('*WaitFor')
-  source shared.vim
-endif
+source shared.vim
 
 func MyHandler(timer)
   let g:val += 1

src/version.c

diff --git a/src/version.c b/src/version.c
index 804f84c..778046b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1162,
+/**/
     1161,
 /**/
     1160,