diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-29 20:39:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-29 20:39:53 +0200 |
| commit | d1ee0043c0360f6b504c0283edd2a844ef73a349 (patch) | |
| tree | 5199fdd43e69a8dcd7709117592fe9a601df936e | |
| parent | 91d348abfc0d7ac9b5b19cde0112de8ae4335602 (diff) | |
patch 8.0.0805: GUI test fails with gnome2v8.0.0805
Problem: GUI test fails with gnome2.
Solution: Set $HOME to an existing directory.
| -rw-r--r-- | src/testdir/runtest.vim | 3 | ||||
| -rw-r--r-- | src/testdir/setup.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 0256d4899c..c57ec5f642 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -158,6 +158,9 @@ func FinishTesting() " Don't write viminfo on exit. set viminfo= + " Clean up files created by setup.vim + call delete('XfakeHOME', 'rf') + if s:fail == 0 " Success, create the .res file so that make knows it's done. exe 'split ' . fnamemodify(g:testname, ':r') . '.res' diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim index 4b6c089637..6299852ea4 100644 --- a/src/testdir/setup.vim +++ b/src/testdir/setup.vim @@ -14,5 +14,7 @@ if 1 endif " Make sure $HOME does not get read or written. - let $HOME = '/does/not/exist' + " It must exist, gnome tries to create $HOME/.gnome2 + let $HOME = getcwd() . '/XfakeHOME' + call mkdir($HOME) endif diff --git a/src/version.c b/src/version.c index 0648dd6ec7..ed7880c856 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 */ /**/ + 805, +/**/ 804, /**/ 803, |