1 files changed, 12 insertions, 11 deletions
diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua
index c5d3e536ad..9b1e803649 100644
--- a/test/functional/ui/output_spec.lua
+++ b/test/functional/ui/output_spec.lua
@@ -31,7 +31,6 @@ describe("shell command :!", function()
 
   after_each(function()
     child_session.feed_data("\3") -- Ctrl-C
-    screen:detach()
   end)
 
   it("displays output without LF/EOF. #4646 #4569 #3772", function()
@@ -52,8 +51,7 @@ describe("shell command :!", function()
 
   it("throttles shell-command output greater than ~10KB", function()
     if 'openbsd' == helpers.uname() then
-      pending('FIXME #10804', function() end)
-      return
+      pending('FIXME #10804')
     end
     child_session.feed_data(":!"..nvim_dir.."/shell-test REP 30001 foo\n")
 
@@ -97,8 +95,7 @@ describe("shell command :!", function()
 
   it('handles control codes', function()
     if iswin() then
-      pending('missing printf', function() end)
-      return
+      pending('missing printf')
     end
     local screen = Screen.new(50, 4)
     screen:attach()
@@ -236,14 +233,18 @@ describe("shell command :!", function()
       set_shell_powershell()
       local screen = Screen.new(30, 4)
       screen:attach()
-      feed_command([[!'echo $a']])
-      screen:expect{any='\necho %$a', timeout=10000}
-      feed_command([[!$a = 1; echo '$a']])
+      feed_command([[!'Write-Output $a']])
+      screen:expect{any='\nWrite%-Output %$a', timeout=10000}
+      feed_command([[!$a = 1; Write-Output '$a']])
       screen:expect{any='\n%$a', timeout=10000}
-      feed_command([[!"echo $a"]])
-      screen:expect{any='\necho', timeout=10000}
-      feed_command([[!$a = 1; echo "$a"]])
+      feed_command([[!"Write-Output $a"]])
+      screen:expect{any='\nWrite%-Output', timeout=10000}
+      feed_command([[!$a = 1; Write-Output "$a"]])
       screen:expect{any='\n1', timeout=10000}
+      feed_command(iswin()
+        and [[!& 'C:\\Windows\\system32\\cmd.exe' /c 'echo $a']]
+        or  [[!& '/bin/sh' -c 'echo ''$a''']])
+      screen:expect{any='\n%$a', timeout=10000}
     end)
   end
 end)