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 61c3472b2ae7de0f68ee9f34dcbb427a42c8be49..189cd82d12d22359504af819c6d6b999baf5e72a 100644 (file)
--- 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 f57dd73ef3f811cca99418f442fb0db9eb7e96cd..cc5c10e9858a6deb9264bb7e1f16636bb1621ac9 100644 (file)
--- 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 768eeade8c658261c82b7f1948bb4646fa15db7c..c8b25c63b5d854fb2a04f3ed3ac5d3a242a660e7 100644 (file)
--- 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 804f84c686f4834b6892117de9bc5dab6d48fe52..778046b953cbf8a4747f2f3ca65ed07ada254ab1 100644 (file)
--- 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,
 /**/