Mercurial > vim
changeset 36113:609bf5215823 v9.1.0721
patch 9.1.0721: tests: test_mksession does not consider XDG_CONFIG_HOME
Commit: https://github.com/vim/vim/commit/5b9237c2e7613f126f95e26056f55024af759102
Author: John M Devin <john.m.devin@gmail.com>
Date: Sun Sep 8 20:00:38 2024 +0200
patch 9.1.0721: tests: test_mksession does not consider XDG_CONFIG_HOME
Problem: tests: test_mksession does not consider XDG_CONFIG_HOME
Solution: allow to match $HOME/.vim/ and $HOME/.config/vim for &viewdir
(John M Devin)
closes: #15639
Signed-off-by: John M Devin <john.m.devin@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 08 Sep 2024 20:15:04 +0200 |
| parents | e384fc00a9e5 |
| children | 3aff196dc6b4 |
| files | src/testdir/setup.vim src/testdir/test_mksession.vim src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/setup.vim +++ b/src/testdir/setup.vim @@ -34,6 +34,10 @@ if 1 " defaults before we get here, and test_mksession checks that. let $ORIGHOME = $HOME + if !exists('$XDG_CONFIG_HOME') + let $XDG_CONFIG_HOME = $HOME .. '/.config' + endif + " Make sure $HOME does not get read or written. " It must exist, gnome tries to create $HOME/.gnome2 let $HOME = getcwd() . '/XfakeHOME'
--- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -1270,7 +1270,10 @@ func Test_mkview_default_home() " use escape() to handle backslash path separators call assert_match('^' .. escape($ORIGHOME, '\') .. '/vimfiles', &viewdir) elseif has('unix') - call assert_match('^' .. $ORIGHOME .. '/.vim', &viewdir) + call assert_match( + \ '^' .. $ORIGHOME .. '/.vim\|' .. + \ '^' .. $XDG_CONFIG_HOME .. '/vim' + \ , &viewdir) elseif has('amiga') call assert_match('^home:vimfiles', &viewdir) elseif has('mac')