From: Bram Moolenaar Date: Wed, 30 Dec 2015 16:17:10 +0000 (+0100) Subject: patch 7.4.1002 X-Git-Tag: v7.4.1002 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=604619784c7f9007a883c123231d080598bd49f5;p=vim patch 7.4.1002 Problem: Cannot run an individual test on MS-Windows. Solution: Move the rule to run test1 downwards. (Ken Takata) --- diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 3fc8b88e0..644573499 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -27,9 +27,6 @@ DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in) .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 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in & 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: diff --git a/src/version.c b/src/version.c index 49199ae6e..62271eda0 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1002, /**/ 1001, /**/