diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-28 16:25:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-28 16:25:00 +0200 |
| commit | 9be0e0b9d31e42d0074527a7789836087475142a (patch) | |
| tree | 108dd8632653767cfb5c3a62431d31b2fe3a320b | |
| parent | 1a613398068580ca1286ac2ed920f20c978aa662 (diff) | |
| download | vim-git-9be0e0b9d31e42d0074527a7789836087475142a.tar.gz | |
patch 8.1.2093: MS-Windows: system() test failsv8.1.2093
Problem: MS-Windows: system() test fails.
Solution: Expect CR when using systemlist().
| -rw-r--r-- | src/testdir/test_system.vim | 8 | ||||
| -rw-r--r-- | 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\<NL>df"], systemlist('more', ["as\<NL>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\<NL>df"])) endif if !executable('cat') || !executable('wc') @@ -62,7 +62,7 @@ func Test_System() call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out) else 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 bwipe! diff --git a/src/version.c b/src/version.c index 057a6f772..db2831bb8 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2093, +/**/ 2092, /**/ 2091, |