changeset 7362:16c67ab8eafd v7.4.986

commit https://github.com/vim/vim/commit/da9888a3f0118ce1ce5acbdcf4720602c2de2a3b Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 28 21:35:14 2015 +0100 patch 7.4.986 Problem: Test49 doesn't work on MS-Windows. test70 is listed twice. Solution: Move test49 to the group not used on Amiga and MS-Windows. Remove test70 from SCRIPTS_WIN32.
author Christian Brabandt <cb@256bit.org>
date Mon, 28 Dec 2015 21:45:04 +0100
parents 7e79aa31c025
children 968a93fc5b1d
files src/testdir/Make_all.mak src/testdir/Make_dos.mak src/version.c
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -127,7 +127,6 @@ SCRIPTS_ALL = \
 # Tests that run on most systems, but not on Amiga.
 SCRIPTS_MORE1 = \
 	test11.out \
-	test49.out \
 	test52.out \
 	test85.out \
 	test86.out \
@@ -141,6 +140,7 @@ SCRIPTS_MORE2 = \
 	test12.out \
 	test25.out \
 	test27.out \
+	test49.out \
 	test97.out
 
 
@@ -163,7 +163,7 @@ SCRIPTS_MORE4 = \
 
 
 # Tests specifically for MS-Windows.
-SCRIPTS_WIN32 = test50.out test70.out
+SCRIPTS_WIN32 = test50.out
 
 
 # Tests for the GUI.
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -13,6 +13,7 @@ VIMPROG = ..\\vim
 # test12	can't unlink a swap file
 # test25	uses symbolic link
 # test27	can't edit file with "*" in file name
+# test49	fails in various ways
 # test97	\{ and \$ are not escaped characters.
 
 SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE3) $(SCRIPTS_MORE4)
--- 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 */
 /**/
+    986,
+/**/
     985,
 /**/
     984,