patch 7.4.1247
Problem: The channel test doesn't run on MS-Windows.
Solution: Make it work on the MS-Windows console. (Ken Takata)
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 140691c..ee7a422 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -2,14 +2,40 @@
scriptencoding utf-8
" This requires the Python command to run the test server.
-" This most likely only works on Unix.
-if !has('unix') || !executable('python')
+" This most likely only works on Unix and Windows console.
+if has('unix')
+ if !executable('python')
+ finish
+ endif
+elseif has('win32') && !has('gui_win32')
+ " Use Python Launcher for Windows (py.exe).
+ if !executable('py')
+ finish
+ endif
+else
finish
endif
+func s:start_server()
+ if has('win32')
+ silent !start cmd /c start "test_channel" py test_channel.py
+ else
+ silent !./test_channel.py&
+ endif
+endfunc
+
+func s:kill_server()
+ if has('win32')
+ call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
+ else
+ call system("killall test_channel.py")
+ endif
+endfunc
+
func Test_communicate()
+ call delete("Xportnr")
" The Python program writes the port number in Xportnr.
- silent !./test_channel.py&
+ call s:start_server()
" Wait for up to 2 seconds for the port number to be there.
let cnt = 20
@@ -29,7 +55,7 @@
if len(l) == 0
" Can't make the connection, give up.
- call system("killall test_channel.py")
+ call s:kill_server()
return
endif
let port = l[0]
@@ -49,5 +75,5 @@
" make the server quit, can't check if this works, should not hang.
call ch_sendexpr(handle, '!quit!', 0)
- call system("killall test_channel.py")
+ call s:kill_server()
endfunc