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.

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index a7de57aaccdc322f56122b8acaa015d0b8b29d3d..d6886b0f0c16fc1a0b62a152db59e1e3fc5b9a68 100644 (file)
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -48,42 +48,45 @@ function! Test_System()
 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)
+  call delete('Xscript')
 
-  let cmd=" -es -u NONE -c 'call doesnotexist()' +q; echo $?"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, a[0])
+  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 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])
+  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 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')
 endfunc

diff --git a/src/version.c b/src/version.c
index b0f1c22451a1b80d235d5777f27ab80e637f9f0d..71c04506f54e902d31758b0a7edf7a16153a6cb1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    197,
 /**/
     196,
 /**/