From 28c3679b641eabea76b67001638aec4884e3d789 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 24 Jul 2018 20:52:08 -0400 Subject: vim-patch:8.0.0805: GUI test fails with gnome2 Problem: GUI test fails with gnome2. Solution: Set $HOME to an existing directory. https://github.com/vim/vim/commit/d1ee0043c0360f6b504c0283edd2a844ef73a349 --- src/nvim/testdir/setup.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/nvim/testdir/setup.vim') diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index aac9fefef4..49656da4d5 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -16,7 +16,8 @@ set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after let &packpath = &rtp " Make sure $HOME does not get read or written. -let $HOME = '/does/not/exist' +let $HOME = getcwd() . '/XfakeHOME' +call mkdir($HOME) " Use default shell on Windows to avoid segfault, caused by TUI if has('win32') -- cgit From 290a9632d60bd97972609a1925d12348ada4889d Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 24 Jul 2018 20:54:14 -0400 Subject: vim-patch:8.0.0806: tests may try to create XfakeHOME twice Problem: Tests may try to create XfakeHOME twice. Solution: Avoid loading setup.vim twice. https://github.com/vim/vim/commit/f98246d4849e670c6660e97887428dcddf88dc9f --- src/nvim/testdir/setup.vim | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/nvim/testdir/setup.vim') diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index 49656da4d5..8f2cf80c6b 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -1,5 +1,11 @@ " Common preparations for running tests. +" Only load this once. +if exists('s:did_load') + finish +endif +let s:did_load = 1 + " Align Nvim defaults to Vim. set sidescroll=0 set directory^=. -- cgit From b0ab46056fe907b4657fe57140c61d540d23b3ca Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 24 Jul 2018 20:56:14 -0400 Subject: vim-patch:8.0.0810: MS-Windows: tests still hang Problem: MS-Windows: tests still hang. Solution: Only create the XfakeHOME directory if it does not exist yet. https://github.com/vim/vim/commit/d0b6c6c54e0f3c2984e1d9b316a587ef14cfd53a --- src/nvim/testdir/setup.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/setup.vim') diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index 8f2cf80c6b..f3cc7da70f 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -22,8 +22,10 @@ set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after let &packpath = &rtp " Make sure $HOME does not get read or written. -let $HOME = getcwd() . '/XfakeHOME' -call mkdir($HOME) +let $HOME = expand(getcwd() . '/XfakeHOME') +if !isdirectory($HOME) + call mkdir($HOME) +endif " Use default shell on Windows to avoid segfault, caused by TUI if has('win32') -- cgit