aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.0153: system() test fails on MS-Windows

Browse Source 
Problem:    system() test fails on MS-Windows.
Solution:   Deal when extra space and CR.
This commit is contained in:
Bram Moolenaar 2017-01-08 13:55:06 +01:00
parent 04e94c7881
commit 9d9c356517
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/testdir/test_system.vim
View File

@ -4,16 +4,36 @@ function! Test_System()
if !executable('echo') || !executable('cat') || !executable('wc')
return
endif
call assert_equal("123\n", system('echo 123'))
call assert_equal(['123'], systemlist('echo 123'))
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\<NL>df"], systemlist('cat', ["as\<NL>df"]))
new Xdummy
call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
call assert_equal("3\n", system('wc -l', bufnr('%')))
call assert_equal(['3'], systemlist('wc -l', bufnr('%')))
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], systemlist('cat', bufnr('%')))
let out = systemlist('wc -l', bufnr('%'))
" On Windows we may get a trailing CR.
if out != ["3\r"]
call assert_equal(['3'], out)
endif
let out = systemlist('cat', bufnr('%'))
" On Windows we may get a trailing CR.
if out != ["asdf\r", "pw\<NL>er\r", "xxxx\r"]
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out)
endif
bwipe!
call assert_fails('call system("wc -l", 99999)', 'E86:')

2
src/version.c
View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
153,
/**/
152,
/**/