mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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.
This commit is contained in:
parent
a0f9cd148e
commit
f92591f7f9
0
src/testdir/test_channel.py
Executable file → Normal file
0
src/testdir/test_channel.py
Executable file → Normal file
@ -4,7 +4,8 @@ scriptencoding utf-8
|
|||||||
" This requires the Python command to run the test server.
|
" This requires the Python command to run the test server.
|
||||||
" This most likely only works on Unix and Windows console.
|
" This most likely only works on Unix and Windows console.
|
||||||
if has('unix')
|
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
|
finish
|
||||||
endif
|
endif
|
||||||
elseif has('win32') && !has('gui_win32')
|
elseif has('win32') && !has('gui_win32')
|
||||||
@ -20,7 +21,7 @@ func s:start_server()
|
|||||||
if has('win32')
|
if has('win32')
|
||||||
silent !start cmd /c start "test_channel" py test_channel.py
|
silent !start cmd /c start "test_channel" py test_channel.py
|
||||||
else
|
else
|
||||||
silent !./test_channel.py&
|
silent !python test_channel.py&
|
||||||
endif
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
@ -28,7 +29,7 @@ func s:kill_server()
|
|||||||
if has('win32')
|
if has('win32')
|
||||||
call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
|
call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
|
||||||
else
|
else
|
||||||
call system("killall test_channel.py")
|
call system("pkill --full test_channel.py")
|
||||||
endif
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@ -742,6 +742,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1248,
|
||||||
/**/
|
/**/
|
||||||
1247,
|
1247,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user