Mercurial > vim
changeset 7902:f12d6235a753 v7.4.1247
commit https://github.com/vim/vim/commit/a0f9cd148eaab23b2037d2f543f3b8f5a3a7ad3c
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 3 20:13:24 2016 +0100
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 03 Feb 2016 20:15:05 +0100 |
| parents | 46e8a350947d |
| children | b9bb340fd94d |
| files | src/testdir/test_channel.py src/testdir/test_channel.vim src/version.c |
| diffstat | 3 files changed, 33 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -7,12 +7,6 @@ # Then Vim can send requests to the server: # :let response = ch_sendexpr(handle, 'hello!') # -# And you can control Vim by typing a JSON message here, e.g.: -# ["ex","echo 'hi there'"] -# -# There is no prompt, just type a line and press Enter. -# To exit cleanly type "quit<Enter>". -# # See ":help channel-demo" in Vim. # # This requires Python 2.6 or later.
--- 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 @@ func Test_communicate() 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 @@ func Test_communicate() " 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