From f8f7f9d5f5aead86541ffcd12e291b6dfb6811e5 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 15 Jan 2018 23:14:20 +0100 Subject: vim-patch:8.0.0151,3,4 #7389 vim-patch:8.0.0151 Problem: To pass buffer content to system() and systemlist() one has to first create a string or list. Solution: Allow passing a buffer number. (LemonBoy, closes vim/vim#1240) https://github.com/vim/vim/commit/12c4492dd35e0cd83c8816be2ec849b836109882 vim-patch:8.0.0153 Problem: system() test fails on MS-Windows. Solution: Deal when extra space and CR. https://github.com/vim/vim/commit/9d9c35651712b88c81f1ae11091de1fd0bbbd35c vim-patch:8.0.0154 Problem: system() test fails on OS/X. Solution: Deal with leading spaces. https://github.com/vim/vim/commit/31f19ce0a052f7c76d44a9a190e468c79cf5d56d --- src/nvim/testdir/test_system.vim | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/nvim/testdir/test_system.vim (limited to 'src/nvim/testdir/test_system.vim') diff --git a/src/nvim/testdir/test_system.vim b/src/nvim/testdir/test_system.vim new file mode 100644 index 0000000000..0446bd9105 --- /dev/null +++ b/src/nvim/testdir/test_system.vim @@ -0,0 +1,48 @@ +" Tests for system() and systemlist() + +function! Test_System() + if !executable('echo') || !executable('cat') || !executable('wc') + return + endif + let out = system('echo 123') + " On Windows we may get a trailing space. + if out != "123 \n" + call assert_equal("123\n", out) + endif + + let out = systemlist('echo 123') + " On Windows we may get a trailing space and CR. + if out != ["123 \r"] + call assert_equal(['123'], out) + endif + + call assert_equal('123', system('cat', '123')) + call assert_equal(['123'], systemlist('cat', '123')) + call assert_equal(["as\df"], systemlist('cat', ["as\df"])) + + new Xdummy + call setline(1, ['asdf', "pw\er", 'xxxx']) + let out = system('wc -l', bufnr('%')) + " On OS/X we get leading spaces + let out = substitute(out, '^ *', '', '') + call assert_equal("3\n", out) + + let out = systemlist('wc -l', bufnr('%')) + " On Windows we may get a trailing CR. + if out != ["3\r"] + " On OS/X we get leading spaces + if type(out) == v:t_list + let out[0] = substitute(out[0], '^ *', '', '') + endif + call assert_equal(['3'], out) + endif + + let out = systemlist('cat', bufnr('%')) + " On Windows we may get a trailing CR. + if out != ["asdf\r", "pw\er\r", "xxxx\r"] + call assert_equal(['asdf', "pw\er", 'xxxx'], out) + endif + bwipe! + + call assert_fails('call system("wc -l", 99999)', 'E86:') +endfunction -- cgit From f50ce7d510cc0b0b31b738670c98e946b5ddd53c Mon Sep 17 00:00:00 2001 From: sohnryang Date: Wed, 31 Jan 2018 19:45:04 +0900 Subject: vim-patch:8.0.0184: fix ex-mode exit code #7943 Problem: When in Ex mode and an error is caught by try-catch, Vim still exits with a non-zero exit code. Solution: Don't set ex_exitval when inside a try-catch. (partly by Christian Brabandt) https://github.com/vim/vim/commit/2b7bc567b9238aaac682236cb4f727d0376e1302 --- src/nvim/testdir/test_system.vim | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'src/nvim/testdir/test_system.vim') diff --git a/src/nvim/testdir/test_system.vim b/src/nvim/testdir/test_system.vim index 0446bd9105..1a09a0d986 100644 --- a/src/nvim/testdir/test_system.vim +++ b/src/nvim/testdir/test_system.vim @@ -46,3 +46,40 @@ function! Test_System() call assert_fails('call system("wc -l", 99999)', 'E86:') 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) + + " 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]) + + let cmd=" -es --headless -u NONE -c 'source Xscript' +q" + let a = system(v:progpath . cmd) + call assert_notequal(0, v:shell_error) + + let cmd=" -es --headless -u NONE -c 'call doesnotexist()' +q; echo $?" + let a = system(v:progpath. cmd) + call assert_notequal(0, a[0]) + + 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]) + + 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 -- cgit From 29395fd304047cb2dcd2af60dda7df05d209c3b2 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 24 Mar 2018 22:55:30 +0100 Subject: 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 --- src/nvim/testdir/test_system.vim | 47 +++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 20 deletions(-) (limited to 'src/nvim/testdir/test_system.vim') 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 -- cgit