adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.1.2093: MS-Windows: system() test fails

Browse Source 
Problem:    MS-Windows: system() test fails.
Solution:   Expect CR when using systemlist().
This commit is contained in:
Bram Moolenaar
2019-09-28 16:25:00 +02:00
parent 1a61339806
commit 9be0e0b9d3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_system.vim
View File

@ -12,9 +12,9 @@ func Test_System()
else else
call assert_equal("123\n", system('echo 123')) call assert_equal("123\n", system('echo 123'))
call assert_equal(["123\r"], systemlist('echo 123')) call assert_equal(["123\r"], systemlist('echo 123'))
call assert_equal("123", system('more', '123')) call assert_equal("123\n", system('more', '123'))
call assert_equal(["123"], systemlist('more', '123')) call assert_equal(["123\r"], systemlist('more', '123'))
call assert_equal(["as\<NL>df"], systemlist('more', ["as\<NL>df"])) call assert_equal(["as\r", "df\r"], systemlist('more', ["as\<NL>df"]))
endif endif
if !executable('cat') || !executable('wc') if !executable('cat') || !executable('wc')
@ -62,7 +62,7 @@ func Test_System()
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out) call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out)
else else
let out = systemlist('more', bufnr('%')) let out = systemlist('more', bufnr('%'))
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out) call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out)
endif endif
bwipe! bwipe!

2
src/version.c
View File

@ -757,6 +757,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 */
/**/
2093,
/**/ /**/
2092, 2092,
/**/ /**/