Skip to content

Commit 9be0e0b

Browse files
committed
patch 8.1.2093: MS-Windows: system() test fails
Problem: MS-Windows: system() test fails. Solution: Expect CR when using systemlist().
1 parent 1a61339 commit 9be0e0b

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/testdir/test_system.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ func Test_System()
1212
else
1313
call assert_equal("123\n", system('echo 123'))
1414
call assert_equal(["123\r"], systemlist('echo 123'))
15-
call assert_equal("123", system('more', '123'))
16-
call assert_equal(["123"], systemlist('more', '123'))
17-
call assert_equal(["as\<NL>df"], systemlist('more', ["as\<NL>df"]))
15+
call assert_equal("123\n", system('more', '123'))
16+
call assert_equal(["123\r"], systemlist('more', '123'))
17+
call assert_equal(["as\r", "df\r"], systemlist('more', ["as\<NL>df"]))
1818
endif
1919

2020
if !executable('cat') || !executable('wc')
@@ -62,7 +62,7 @@ func Test_System()
6262
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out)
6363
else
6464
let out = systemlist('more', bufnr('%'))
65-
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out)
65+
call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out)
6666
endif
6767
bwipe!
6868

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,8 @@ static char *(features[]) =
757757

758758
static int included_patches[] =
759759
{ /* Add new patch number below this line */
760+
/**/
761+
2093,
760762
/**/
761763
2092,
762764
/**/

0 commit comments

Comments
 (0)