Skip to content
Permalink
Browse files

patch 8.0.0197: system() test skips some parts for MS-Windows

Problem:    On MS-Windows the system() test skips a few parts.
Solution:   Swap single and double quotes for the command.
  • Loading branch information...
brammool committed Jan 16, 2017
1 parent c011a3d commit 97d62d4321df358665e2e6504aad8ac2ba7fd841
Showing with 28 additions and 23 deletions.
  1. +26 −23 src/testdir/test_system.vim
  2. +2 −0 src/version.c
@@ -48,42 +48,45 @@ function! Test_System()
endfunction

function! Test_system_exmode()
if !has('unix')
return
if has('unix') " echo $? only works on Unix
let cmd = ' -es -u NONE -c "source Xscript" +q; echo $?'
" 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_equal(0, v:shell_error)
endif

let cmd=" -es -u NONE -c 'source Xscript' +q; echo $?"
" 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_equal(0, v:shell_error)

" Error before try does set error flag.
call writefile(['call nosuchfunction()', 'try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
let a = system(v:progpath . cmd)
call assert_notequal('0', a[0])
if has('unix') " echo $? only works on Unix
let a = system(v:progpath . cmd)
call assert_notequal('0', a[0])
endif

let cmd=" -es -u NONE -c 'source Xscript' +q"
let cmd = ' -es -u NONE -c "source Xscript" +q'
let a = system(v:progpath . cmd)
call assert_notequal(0, v:shell_error)
call delete('Xscript')

let cmd=" -es -u NONE -c 'call doesnotexist()' +q; echo $?"
let a = system(v:progpath. cmd)
call assert_notequal(0, a[0])
if has('unix') " echo $? only works on Unix
let cmd = ' -es -u NONE -c "call doesnotexist()" +q; echo $?'
let a = system(v:progpath. cmd)
call assert_notequal(0, a[0])
endif

let cmd=" -es -u NONE -c 'call doesnotexist()' +q"
let cmd = ' -es -u NONE -c "call doesnotexist()" +q'
let a = system(v:progpath. cmd)
call assert_notequal(0, v:shell_error)

let cmd=" -es -u NONE -c 'call doesnotexist()|let a=1' +q; echo $?"
let a = system(v:progpath. cmd)
call assert_notequal(0, a[0])
if has('unix') " echo $? only works on Unix
let cmd = ' -es -u NONE -c "call doesnotexist()|let a=1" +q; echo $?'
let a = system(v:progpath. cmd)
call assert_notequal(0, a[0])
endif

let cmd=" -es -u NONE -c 'call doesnotexist()|let a=1' +q"
let cmd = ' -es -u NONE -c "call doesnotexist()|let a=1" +q'
let a = system(v:progpath. cmd)
call assert_notequal(0, v:shell_error)

call delete('Xscript')
endfunc
@@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
197,
/**/
196,
/**/

0 comments on commit 97d62d4

Please sign in to comment.
You can’t perform that action at this time.