changeset 10775:d08655e2633a v8.0.0277

patch 8.0.0277: the GUI test may trigger fontconfig and take a long time commit https://github.com/vim/vim/commit/56e6bd7ba2edcb069f55c3515341537c654a9046 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 1 12:08:47 2017 +0100 patch 8.0.0277: the GUI test may trigger fontconfig and take a long time Problem: The GUI test may trigger fontconfig and take a long time. Solution: Set $XDG_CACHE_HOME. (Kazunobu Kuriyama)
author Christian Brabandt <cb@256bit.org>
date Wed, 01 Feb 2017 12:15:04 +0100
parents 97a5a7ef2e9c
children 74aee6c02b6a
files src/testdir/test_gui.vim src/testdir/unix.vim src/version.c
diffstat 3 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -10,7 +10,11 @@ func SetUp()
     set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0
   endif
 
-  " Gnome insists on creating $HOME/.gnome2/..
+  " Gnome insists on creating $HOME/.gnome2/, and we're going to abide by
+  " that, taking care to have the font cache work normally.
+  if $XDG_CACHE_HOME == ''
+    let $XDG_CACHE_HOME = g:tester_HOME . '/.cache'
+  endif
   call mkdir('Xhome')
   let $HOME = fnamemodify('Xhome', ':p')
 endfunc
--- a/src/testdir/unix.vim
+++ b/src/testdir/unix.vim
@@ -2,4 +2,9 @@
 " Always use "sh", don't use the value of "$SHELL".
 set shell=sh
 
+" While some tests overwrite $HOME to prevent them from polluting user files,
+" we need to remember the original value so that we can tell external systems
+" where to ask about their own user settings.
+let g:tester_HOME = $HOME
+
 source setup.vim
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    277,
+/**/
     276,
 /**/
     275,