diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-01 12:08:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-01 12:08:47 +0100 |
| commit | 56e6bd7ba2edcb069f55c3515341537c654a9046 (patch) | |
| tree | ab21487974e0ba90e0e71a7ba0233c2480da70c4 | |
| parent | 3954e3c4b5d2bfda4c481c076fbc39ab06be7639 (diff) | |
| download | vim-git-56e6bd7ba2edcb069f55c3515341537c654a9046.tar.gz | |
patch 8.0.0277: the GUI test may trigger fontconfig and take a long timev8.0.0277
Problem: The GUI test may trigger fontconfig and take a long time.
Solution: Set $XDG_CACHE_HOME. (Kazunobu Kuriyama)
| -rw-r--r-- | src/testdir/test_gui.vim | 6 | ||||
| -rw-r--r-- | src/testdir/unix.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index d95d991eb..fbea706bd 100644 --- 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 diff --git a/src/testdir/unix.vim b/src/testdir/unix.vim index 36dd4e1e3..2290ec9cb 100644 --- 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 diff --git a/src/version.c b/src/version.c index 8aeb688a0..3aa178691 100644 --- 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, |