Mercurial > vim
changeset 9501:f0201deac2a2 v7.4.2031
commit https://github.com/vim/vim/commit/89b10421ca1aea55acbafac1df93be4e20210ceb
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jul 12 22:51:22 2016 +0200
patch 7.4.2031
Problem: The list_lbr_utf8 test fails if ~/.vim/syntax/c.vim sets
'textwidth' to a non-zero value. (Oyvind A. Holm)
Solution: Add a setup.vim file that sets 'runtimepath' and $HOME to a safe
value. (partly by Christian Brabandt, closes #912)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 12 Jul 2016 23:00:06 +0200 |
parents | 8b84bbba325e |
children | f72e07b577b5 |
files | src/testdir/amiga.vim src/testdir/dos.vim src/testdir/runtest.vim src/testdir/setup.vim src/testdir/unix.vim src/testdir/vms.vim src/version.c |
diffstat | 7 files changed, 25 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/amiga.vim +++ b/src/testdir/amiga.vim @@ -2,3 +2,5 @@ set shell=csh map! /tmp t: cmap !rm !Delete all + +source setup.vim
--- a/src/testdir/dos.vim +++ b/src/testdir/dos.vim @@ -5,3 +5,5 @@ set shell=c:\COMMAND.COM shellquote= she if executable("cmd.exe") set shell=cmd.exe endif + +source setup.vim
--- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -42,6 +42,9 @@ if &lines < 24 || &columns < 80 cquit endif +" Common with all tests on all systems. +source setup.vim + " For consistency run all tests with 'nocompatible' set. " This also enables use of line continuation. set nocp viminfo+=nviminfo @@ -55,9 +58,6 @@ lang mess C " Always use forward slashes. set shellslash -" Make sure $HOME does not get read or written. -let $HOME = '/does/not/exist' - let s:srcdir = expand('%:p:h:h') " Prepare for calling test_garbagecollect_now().
new file mode 100644 --- /dev/null +++ b/src/testdir/setup.vim @@ -0,0 +1,11 @@ +" Common preparations for running tests. + +" Make sure 'runtimepath' does not include $HOME. +set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after + +" Only when the +eval feature is present. +if 1 + " Make sure $HOME does not get read or written. + let $HOME = '/does/not/exist' +endif +
--- a/src/testdir/unix.vim +++ b/src/testdir/unix.vim @@ -1,3 +1,5 @@ " Settings for test script execution " Always use "sh", don't use the value of "$SHELL". set shell=sh + +source setup.vim