summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-03 21:45:27 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-03 21:45:27 +0100
commit2212c4154cde0641225782cc4dd1a6483ff2ff35 (patch)
tree5fb9f425d5c1228c9e0772b07b51c701951446c2
parentfcb1e3d16832ce06da0dc38ecb7ab9aaa3ee4383 (diff)
downloadvim-git-2212c4154cde0641225782cc4dd1a6483ff2ff35.tar.gz
patch 7.4.1250v7.4.1250
Problem: Running tests in shadow directory fails. Solution: Also link testdir/*.py
-rw-r--r--src/Makefile2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 93a889831..8985e40f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2012,6 +2012,7 @@ test_arglist \
test_assert \
test_backspace_opt \
test_cdo \
+ test_channel \
test_cursor_func \
test_delete \
test_expand \
@@ -2552,6 +2553,7 @@ shadow: runtime pixmaps
../../testdir/Make_all.mak \
../../testdir/*.in \
../../testdir/*.vim \
+ ../../testdir/*.py \
../../testdir/python* \
../../testdir/sautest \
../../testdir/test83-tags? \
diff --git a/src/version.c b/src/version.c
index d06e1617b..4af96f156 100644
--- 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 */
/**/
+ 1250,
+/**/
1249,
/**/
1248,