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 3fc8b88e0c8244dc6994e9871653ab87adb8a86f..644573499b6d69a6c15425bce8b34d3a76a9c098 100644 (file)
--- 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 49199ae6e717575fc9f627f7b7052a943c055264..62271eda08f7ce23b4e3ccc2ee427f8f7c1cf443 100644 (file)
--- 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,
 /**/