]> granicus.if.org Git - vim/commitdiff
patch 8.0.0806: tests may try to create XfakeHOME twice v8.0.0806
authorBram Moolenaar <Bram@vim.org>
Sat, 29 Jul 2017 20:21:18 +0000 (22:21 +0200)
committerBram Moolenaar <Bram@vim.org>
Sat, 29 Jul 2017 20:21:18 +0000 (22:21 +0200)
Problem:    Tests may try to create XfakeHOME twice.
Solution:   Avoid loading setup.vim twice.

src/testdir/setup.vim
src/version.c

index 6299852ea4c0c192a182a8f9d53d25f59a8deaa2..31b133f10d45eb813de739bbf346768a32173893 100644 (file)
@@ -1,5 +1,13 @@
 " Common preparations for running tests.
 
+" Only load this once.
+if 1
+  if exists('s:did_load')
+    finish
+  endif
+  let s:did_load = 1
+endif
+
 " Make sure 'runtimepath' and 'packpath' does not include $HOME.
 set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
 if has('packages')
index ed7880c8565922ea5f337fa7bac6d13a04081b5f..cde101ab633f530f48ddcb1df08de17cbc26a46a 100644 (file)
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    806,
 /**/
     805,
 /**/