Mercurial > vim

changeset 18197:78d4902b22df v8.1.2093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2093: MS-Windows: system() test fails Commit: https://github.com/vim/vim/commit/9be0e0b9d31e42d0074527a7789836087475142a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 28 16:25:00 2019 +0200 patch 8.1.2093: MS-Windows: system() test fails Problem: MS-Windows: system() test fails. Solution: Expect CR when using systemlist().
author Bram Moolenaar <Bram@vim.org>
date Sat, 28 Sep 2019 16:30:03 +0200
parents 3bf0235443ac
children 3ebea66ebaff
files src/testdir/test_system.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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!
 
--- 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,