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

Problem:    MS-Windows: system() test fails.
Solution:   Expect CR when using systemlist().

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index 22aceb707874995f62a5365315c1cdd0d71d9a2f..dfe36837236c698d3d3ea98a421b80ba09e86638 100644 (file)
--- 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 057a6f7726d9f51111774fc51cf4ef4cb182adc7..db2831bb868ba3c056410f91cb88aea773e63215 100644 (file)
--- 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,
 /**/