From 29395fd304047cb2dcd2af60dda7df05d209c3b2 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 24 Mar 2018 22:55:30 +0100
Subject: [PATCH] vim-patches: test_system.vim

vim-patch:8.0.0185: system() test fails on MS-Windows
vim-patch:8.0.0197: system() test skips some parts for MS-Windows
vim-patch:8.0.0701: system test failing when using X11 forwarding
---
 src/nvim/testdir/test_system.vim | 61 ++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/nvim/testdir/test_system.vim b/src/nvim/testdir/test_system.vim
index 1a09a0d986..ce9d110d82 100644
--- a/src/nvim/testdir/test_system.vim
+++ b/src/nvim/testdir/test_system.vim
@@ -48,38 +48,45 @@ function! Test_System()
 endfunction
 
 function! Test_system_exmode()
-  let cmd=" -es --headless -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)
+  if has('unix') " echo $? only works on Unix
+    let cmd = ' -es --headless -u NONE -c "source Xscript" +q; echo "result=$?"'
+    " 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_match('result=0', a)
+    call assert_equal(0, v:shell_error)
+  endif
 
   " 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 --headless -u NONE -c 'source Xscript' +q"
+  let cmd = ' -es --headless -u NONE -c "source Xscript" +q'
   let a = system(v:progpath . cmd)
   call assert_notequal(0, v:shell_error)
-
-  let cmd=" -es --headless -u NONE -c 'call doesnotexist()' +q; echo $?"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, a[0])
-
-  let cmd=" -es --headless -u NONE -c 'call doesnotexist()' +q"
-  let a = system(v:progpath. cmd)
-  call assert_notequal(0, v:shell_error)
-
-  let cmd=" -es --headless -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 --headless -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 --headless -u NONE -c "call doesnotexist()" +q; echo $?'
+    let a = system(v:progpath. cmd)
+    call assert_notequal(0, a[0])
+  endif
+
+  let cmd = ' -es --headless -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 --headless -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 --headless -u NONE -c "call doesnotexist()|let a=1" +q'
+  let a = system(v:progpath. cmd)
+  call assert_notequal(0, v:shell_error)
 endfunc