Permalink
Browse files

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 #1812)
            Also use a better check for the exit value.
  • Loading branch information...
brammool committed Jul 8, 2017
1 parent 0ea5070 commit 11e79bb04ea635d180dd79b1d5cbc755b56e66e1
Showing with 9 additions and 3 deletions.
  1. +5 −1 src/testdir/setup.vim
  2. +2 −2 src/testdir/test_system.vim
  3. +2 −0 src/version.c
View
@@ -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
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
701,
/**/
700,
/**/

0 comments on commit 11e79bb

Please sign in to comment.