Mercurial > vim

changeset 11852:825a4717f14a v8.0.0806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0806: tests may try to create XfakeHOME twice commit https://github.com/vim/vim/commit/f98246d4849e670c6660e97887428dcddf88dc9f Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 29 22:21:18 2017 +0200 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.
author Christian Brabandt <cb@256bit.org>
date Sat, 29 Jul 2017 22:30:04 +0200
parents c98345b22125
children 447ec5a86395
files src/testdir/setup.vim src/version.c
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    806,
+/**/
     805,
 /**/
     804,