mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.0153: system() test fails on MS-Windows
Problem: system() test fails on MS-Windows. Solution: Deal when extra space and CR.
This commit is contained in:
parent
04e94c7881
commit
9d9c356517
@ -4,16 +4,36 @@ function! Test_System()
|
|||||||
if !executable('echo') || !executable('cat') || !executable('wc')
|
if !executable('echo') || !executable('cat') || !executable('wc')
|
||||||
return
|
return
|
||||||
endif
|
endif
|
||||||
call assert_equal("123\n", system('echo 123'))
|
let out = system('echo 123')
|
||||||
call assert_equal(['123'], systemlist('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', system('cat', '123'))
|
||||||
call assert_equal(['123'], systemlist('cat', '123'))
|
call assert_equal(['123'], systemlist('cat', '123'))
|
||||||
call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"]))
|
call assert_equal(["as\<NL>df"], systemlist('cat', ["as\<NL>df"]))
|
||||||
new Xdummy
|
new Xdummy
|
||||||
call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
|
call setline(1, ['asdf', "pw\<NL>er", 'xxxx'])
|
||||||
call assert_equal("3\n", system('wc -l', bufnr('%')))
|
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!
|
bwipe!
|
||||||
|
|
||||||
call assert_fails('call system("wc -l", 99999)', 'E86:')
|
call assert_fails('call system("wc -l", 99999)', 'E86:')
|
||||||
|
@ -764,6 +764,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
153,
|
||||||
/**/
|
/**/
|
||||||
152,
|
152,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user