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.

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index ee7a422447f97910a4b1716614a8704861cdf155..9d4c7783720c25f3fe62d6f6673dd0771b2b6a32 100644 (file)
--- 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
 

diff --git a/src/version.c b/src/version.c
index 9417f5e4456a07cd389cf4987dedb70ddbd10a89..80abec4a79761664494d518a4231426fb84d4fae 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1248,
 /**/
     1247,
 /**/