changeset 7395:377253525da5 v7.4.1002

commit https://github.com/vim/vim/commit/604619784c7f9007a883c123231d080598bd49f5 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 30 17:17:10 2015 +0100 patch 7.4.1002 Problem: Cannot run an individual test on MS-Windows. Solution: Move the rule to run test1 downwards. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Wed, 30 Dec 2015 17:30:04 +0100
parents 81304fd09fec
children 28cd63627ffa
files src/testdir/Make_dos.mak src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -27,9 +27,6 @@ DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=
 
 .SUFFIXES: .in .out .res .vim
 
-# Must run test1 first to create small.vim.
-$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
-
 nongui:	nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests report
 
 small:	nolog report
@@ -67,6 +64,11 @@ win32:	nolog $(SCRIPTS_FIRST) $(SCRIPTS)
 		 & echo $* FAILED >> test.log ) \
 		else ( move /y test.out $*.out )
 
+# Must run test1 first to create small.vim.
+# This rule must come after the one that copies the input files to dostmp to
+# allow for running an individual test.
+$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
+
 report:
 	@echo ""
 	@echo Test results:
--- 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 */
 /**/
+    1002,
+/**/
     1001,
 /**/
     1000,