Skip to content

Commit f92591f

Browse files
committed
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.
1 parent a0f9cd1 commit f92591f

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/testdir/test_channel.py

100755100644
File mode changed.

src/testdir/test_channel.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ scriptencoding utf-8
44
" This requires the Python command to run the test server.
55
" This most likely only works on Unix and Windows console.
66
if has('unix')
7-
if !executable('python')
7+
" We also need the pkill command to make sure the server can be stopped.
8+
if !executable('python') || !executable('pkill')
89
finish
910
endif
1011
elseif has('win32') && !has('gui_win32')
@@ -20,15 +21,15 @@ func s:start_server()
2021
if has('win32')
2122
silent !start cmd /c start "test_channel" py test_channel.py
2223
else
23-
silent !./test_channel.py&
24+
silent !python test_channel.py&
2425
endif
2526
endfunc
2627

2728
func s:kill_server()
2829
if has('win32')
2930
call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
3031
else
31-
call system("killall test_channel.py")
32+
call system("pkill --full test_channel.py")
3233
endif
3334
endfunc
3435

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
1248,
745747
/**/
746748
1247,
747749
/**/

0 commit comments

Comments
 (0)