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/message.c | 5 ++--- src/nvim/testdir/test_system.vim | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/message.c b/src/nvim/message.c index e522670a65..12e5b844be 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -487,9 +487,6 @@ int emsg(const char_u *s_) } called_emsg = true; - if (emsg_silent == 0) { - ex_exitval = 1; - } // If "emsg_severe" is TRUE: When an error exception is to be thrown, // prefer this message over previous messages for the same command. @@ -540,6 +537,8 @@ int emsg(const char_u *s_) return true; } + ex_exitval = 1; + // Reset msg_silent, an error causes messages to be switched back on. msg_silent = 0; cmd_silent = FALSE; 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') 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