changeset 7922:14540239601d v7.4.1257

commit https://github.com/vim/vim/commit/e24692573a266f5060c06dd80bde264092c90dd5 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 4 10:54:34 2016 +0100 patch 7.4.1257 Problem: Channel test fails in some configurations. Solution: Add check for the +channel feature.
author Christian Brabandt <cb@256bit.org>
date Thu, 04 Feb 2016 11:00:04 +0100
parents 942b91b6707e
children dacd57ae37f5
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1,7 +1,11 @@
 " Test for channel functions.
 scriptencoding utf-8
 
-" This requires the Python command to run the test server.
+if !has('channel')
+  finish
+endif
+
+" This test requires the Python command to run the test server.
 " This most likely only works on Unix and Windows console.
 if has('unix')
   " We also need the pkill command to make sure the server can be stopped.
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1257,
+/**/
     1256,
 /**/
     1255,