Mercurial > vim
changeset 7904:14a5de0990a5 v7.4.1248
commit https://github.com/vim/vim/commit/f92591f7f9fc78d2aced99befe444cb423b26df8
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 3 20:22:32 2016 +0100
patch 7.4.1248
Problem: Can't reliably stop the channel test server. Can't start the
server if the python file is not executable.
Solution: Use "pkill" instead of "killall". Run the python file as an
argument instead of as an executable.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 03 Feb 2016 20:30:04 +0100 |
parents | b9bb340fd94d |
children | dfdf2ee817fa |
files | src/testdir/test_channel.py src/testdir/test_channel.vim src/version.c |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -4,7 +4,8 @@ scriptencoding utf-8 " This requires the Python command to run the test server. " This most likely only works on Unix and Windows console. if has('unix') - if !executable('python') + " We also need the pkill command to make sure the server can be stopped. + if !executable('python') || !executable('pkill') finish endif elseif has('win32') && !has('gui_win32') @@ -20,7 +21,7 @@ func s:start_server() if has('win32') silent !start cmd /c start "test_channel" py test_channel.py else - silent !./test_channel.py& + silent !python test_channel.py& endif endfunc @@ -28,7 +29,7 @@ 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") + call system("pkill --full test_channel.py") endif endfunc