Mercurial > vim
changeset 11637:bcab4e804c20 v8.0.0701
patch 8.0.0701: system test failing when using X11 forwarding
commit https://github.com/vim/vim/commit/11e79bb04ea635d180dd79b1d5cbc755b56e66e1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 8 17:03:21 2017 +0200
patch 8.0.0701: system test failing when using X11 forwarding
Problem: System test failing when using X11 forwarding.
Solution: Set $XAUTHORITY before changing $HOME. (closes https://github.com/vim/vim/issues/1812)
Also use a better check for the exit value.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 08 Jul 2017 17:15:03 +0200 |
| parents | 0f5bf68f0ecc |
| children | 8bac0b53882b |
| files | src/testdir/setup.vim src/testdir/test_system.vim src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/setup.vim +++ b/src/testdir/setup.vim @@ -8,7 +8,11 @@ endif " Only when the +eval feature is present. if 1 + " Make sure the .Xauthority file can be found after changing $HOME. + if $XAUTHORITY == '' + let $XAUTHORITY = $HOME . '/.Xauthority' + endif + " Make sure $HOME does not get read or written. let $HOME = '/does/not/exist' endif -
--- a/src/testdir/test_system.vim +++ b/src/testdir/test_system.vim @@ -49,12 +49,12 @@ endfunction function! Test_system_exmode() if has('unix') " echo $? only works on Unix - let cmd = ' -es -u NONE -c "source Xscript" +q; echo $?' + let cmd = ' -es -u NONE -c "source Xscript" +q; echo "result=$?"' " Need to put this in a script, "catch" isn't found after an unknown " function. call writefile(['try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript') let a = system(v:progpath . cmd) - call assert_equal('0', a[0]) + call assert_match('result=0', a) call assert_equal(0, v:shell_error) endif