summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-22 22:05:32 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-22 22:05:32 +0100
commit2cd5bb2505acc001933e97cf788f473f8db60895 (patch)
treedaab6a1ec64ea2400c63146ccad29c2ec36bcc1d
parent4db20ab091330e460f08651d6052afd0536c507a (diff)
patch 7.4.1392v7.4.1392
Problem: Some tests fail for Win32 console version. Solution: Move the tests to SCRIPTS_MORE2. Pass VIMRUNTIME. (Christian Brabandt)
-rw-r--r--src/testdir/Make_all.mak6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index bb92904bf0..3e645e7ed5 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -15,7 +15,6 @@ SCRIPTS_ALL = \
test7.out \
test8.out \
test9.out \
- test13.out \
test14.out \
test15.out \
test18.out \
@@ -104,7 +103,6 @@ SCRIPTS_ALL = \
test_insertcount.out \
test_listchars.out \
test_listlbr.out \
- test_listlbr_utf8.out \
test_mapping.out \
test_marks.out \
test_match_conceal.out \
@@ -135,9 +133,11 @@ SCRIPTS_MORE2 = \
test2.out \
test10.out \
test12.out \
+ test13.out \
test25.out \
test49.out \
- test97.out
+ test97.out \
+ test_listlbr_utf8.out
# Tests that run on most systems, but not MingW and Cygwin.
diff --git a/src/version.c b/src/version.c
index 7af412b03b..b545581842 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1392,
+/**/
1391,
/**/
1390,