patch 8.0.0805: GUI test fails with gnome2

Problem:    GUI test fails with gnome2.
Solution:   Set $HOME to an existing directory.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 0256d4899c8e86d397d34cc8603907adb1b4b3da..c57ec5f642a0d22b9a71824fe124fd0779944882 100644 (file)
--- 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 4b6c089637de63372ada0e026aac563bffc20a1e..6299852ea4c0c192a182a8f9d53d25f59a8deaa2 100644 (file)
--- 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 0648dd6ec758cf26522ea0f565bf52460147a35a..ed7880c8565922ea5f337fa7bac6d13a04081b5f 100644 (file)
--- 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 */
+/**/
+    805,
 /**/
     804,
 /**/