diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-29 22:21:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-29 22:21:18 +0200 |
| commit | f98246d4849e670c6660e97887428dcddf88dc9f (patch) | |
| tree | 70b60894eea62c6a7dfc128a59a292b23edb7061 | |
| parent | d1ee0043c0360f6b504c0283edd2a844ef73a349 (diff) | |
patch 8.0.0806: tests may try to create XfakeHOME twicev8.0.0806
Problem: Tests may try to create XfakeHOME twice.
Solution: Avoid loading setup.vim twice.
| -rw-r--r-- | src/testdir/setup.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim index 6299852ea4..31b133f10d 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 ed7880c856..cde101ab63 100644 --- 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, |