From 9be0e0b9d31e42d0074527a7789836087475142a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 28 Sep 2019 16:25:00 +0200 Subject: [PATCH] patch 8.1.2093: MS-Windows: system() test fails Problem: MS-Windows: system() test fails. Solution: Expect CR when using systemlist(). --- src/testdir/test_system.vim | 8 ++++---- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim index 22aceb707..dfe368372 100644 --- a/src/testdir/test_system.vim +++ b/src/testdir/test_system.vim @@ -12,9 +12,9 @@ func Test_System() else call assert_equal("123\n", system('echo 123')) call assert_equal(["123\r"], systemlist('echo 123')) - call assert_equal("123", system('more', '123')) - call assert_equal(["123"], systemlist('more', '123')) - call assert_equal(["as\df"], systemlist('more', ["as\df"])) + call assert_equal("123\n", system('more', '123')) + call assert_equal(["123\r"], systemlist('more', '123')) + call assert_equal(["as\r", "df\r"], systemlist('more', ["as\df"])) endif if !executable('cat') || !executable('wc') @@ -62,7 +62,7 @@ func Test_System() call assert_equal(['asdf', "pw\er", 'xxxx'], out) else let out = systemlist('more', bufnr('%')) - call assert_equal(['asdf', "pw\er", 'xxxx'], out) + call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out) endif bwipe! diff --git a/src/version.c b/src/version.c index 057a6f772..db2831bb8 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2093, /**/ 2092, /**/ -- 2.40.0