commit 97d62d4321df358665e2e6504aad8ac2ba7fd841
author Bram Moolenaar <Bram@vim.org> Mon Jan 16 22:53:57 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jan 16 22:53:57 2017 +0100
tree 3eac3ee449166361d9e4485854c40d73c7c22428
parent c011a3d083001bcd9853b4447422f1819f3cee2f

patch 8.0.0197: system() test skips some parts for MS-Windows

Problem:    On MS-Windows the system() test skips a few parts.
Solution:   Swap single and double quotes for the command.

src/testdir/test_system.vim

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index a7de57a..d6886b0 100644
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -48,42 +48,45 @@
 endfunction
 
 function! Test_system_exmode()
-  if !has('unix')
-    return
+  if has('unix') " echo $? only works on Unix
+    let cmd = ' -es -u NONE -c "source Xscript" +q; echo $?'
+    " Need to put this in a script, "catch" isn't found after an unknown
+    " function.
+    call writefile(['try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
+    let a = system(v:progpath . cmd)
+    call assert_equal('0', a[0])
+    call assert_equal(0, v:shell_error)
   endif
 
-  let cmd=" -es -u NONE -c 'source Xscript' +q; echo $?"
-  " Need to put this in a script, "catch" isn't found after an unknown
-  " function.
-  call writefile(['try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
-  let a = system(v:progpath . cmd)
-  call assert_equal('0', a[0])
-  call assert_equal(0, v:shell_error)
-
   " Error before try does set error flag.
   call writefile(['call nosuchfunction()', 'try', 'call doesnotexist()', 'catch', 'endtry'], 'Xscript')
-  let a = system(v:progpath . cmd)
-  call assert_notequal('0', a[0])
+  if has('unix') " echo $? only works on Unix
+    let a = system(v:progpath . cmd)
+    call assert_notequal('0', a[0])
+  endif
 
-  let cmd=" -es -u NONE -c 'source Xscript' +q"
+  let cmd = ' -es -u NONE -c "source Xscript" +q'
   let a = system(v:progpath . cmd)
   call assert_notequal(0, v:shell_error)
-
-  let cmd=" -es -u NONE -c 'call doesnotexist()' +q; echo $?"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, a[0])
-
-  let cmd=" -es -u NONE -c 'call doesnotexist()' +q"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, v:shell_error)
-
-  let cmd=" -es -u NONE -c 'call doesnotexist()|let a=1' +q; echo $?"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, a[0])
-
-  let cmd=" -es -u NONE -c 'call doesnotexist()|let a=1' +q"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, v:shell_error)
-
   call delete('Xscript')
+
+  if has('unix') " echo $? only works on Unix
+    let cmd = ' -es -u NONE -c "call doesnotexist()" +q; echo $?'
+    let a = system(v:progpath. cmd)
+    call assert_notequal(0, a[0])
+  endif
+
+  let cmd = ' -es -u NONE -c "call doesnotexist()" +q'
+  let a = system(v:progpath. cmd)
+  call assert_notequal(0, v:shell_error)
+
+  if has('unix') " echo $? only works on Unix
+    let cmd = ' -es -u NONE -c "call doesnotexist()|let a=1" +q; echo $?'
+    let a = system(v:progpath. cmd)
+    call assert_notequal(0, a[0])
+  endif
+
+  let cmd = ' -es -u NONE -c "call doesnotexist()|let a=1" +q'
+  let a = system(v:progpath. cmd)
+  call assert_notequal(0, v:shell_error)
 endfunc

src/version.c

diff --git a/src/version.c b/src/version.c
index b0f1c22..71c0450 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    197,
+/**/
     196,
 /**/
     195,