diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-03-24 22:55:30 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-03-24 23:06:09 +0100 |
| commit | 29395fd304047cb2dcd2af60dda7df05d209c3b2 (patch) | |
| tree | b077366a5970677fab7d660ecb48d3c779259a2c | |
| parent | f50ce7d510cc0b0b31b738670c98e946b5ddd53c (diff) | |
| download | rneovim-29395fd304047cb2dcd2af60dda7df05d209c3b2.tar.gz rneovim-29395fd304047cb2dcd2af60dda7df05d209c3b2.tar.bz2 rneovim-29395fd304047cb2dcd2af60dda7df05d209c3b2.zip | |
vim-patches: test_system.vim
vim-patch:8.0.0185: system() test fails on MS-Windows
vim-patch:8.0.0197: system() test skips some parts for MS-Windows
vim-patch:8.0.0701: system test failing when using X11 forwarding
| -rw-r--r-- | src/nvim/testdir/test_system.vim | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/src/nvim/testdir/test_system.vim b/src/nvim/testdir/test_system.vim index 1a09a0d986..ce9d110d82 100644 --- a/src/nvim/testdir/test_system.vim +++ b/src/nvim/testdir/test_system.vim @@ -48,38 +48,45 @@ function! Test_System() endfunction function! Test_system_exmode() - let cmd=" -es --headless -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) + if has('unix') " echo $? only works on Unix + let cmd = ' -es --headless -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_match('result=0', a) + call assert_equal(0, v:shell_error) + endif " 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 --headless -u NONE -c 'source Xscript' +q" + let cmd = ' -es --headless -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 --headless -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 --headless -u NONE -c "call doesnotexist()" +q; echo $?' + let a = system(v:progpath. cmd) + call assert_notequal(0, a[0]) + endif - let cmd=" -es --headless -u NONE -c 'call doesnotexist()' +q" + let cmd = ' -es --headless -u NONE -c "call doesnotexist()" +q' let a = system(v:progpath. cmd) call assert_notequal(0, v:shell_error) - let cmd=" -es --headless -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 --headless -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 --headless -u NONE -c 'call doesnotexist()|let a=1' +q" + let cmd = ' -es --headless -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 |