From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 29 Jul 2017 20:21:18 +0000 (+0200)
Subject: patch 8.0.0806: tests may try to create XfakeHOME twice
X-Git-Tag: v8.0.0806
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f98246d4849e670c6660e97887428dcddf88dc9f;p=vim

patch 8.0.0806: tests may try to create XfakeHOME twice

Problem:    Tests may try to create XfakeHOME twice.
Solution:   Avoid loading setup.vim twice.
---

diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index 6299852ea..31b133f10 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -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')
diff --git a/src/version.c b/src/version.c
index ed7880c85..cde101ab6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    806,
 /**/
     805,
 /**/