Permalink
Browse files

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)
  • Loading branch information...
brammool committed Feb 1, 2017
1 parent 3954e3c commit 56e6bd7ba2edcb069f55c3515341537c654a9046
Showing with 12 additions and 1 deletion.
  1. +5 −1 src/testdir/test_gui.vim
  2. +5 −0 src/testdir/unix.vim
  3. +2 −0 src/version.c
View
@@ -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
View
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 277,
/**/
276,
/**/

0 comments on commit 56e6bd7

Please sign in to comment.