diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-12-30 17:17:10 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-12-30 17:17:10 +0100 |
commit | 604619784c7f9007a883c123231d080598bd49f5 (patch) | |
tree | b4a7f8464da40eb34222cea76cf301613959240b /src | |
parent | f49e240c2def978247fa457aa105bb3024413f7d (diff) |
patch 7.4.1002v7.4.1002
Problem: Cannot run an individual test on MS-Windows.
Solution: Move the rule to run test1 downwards. (Ken Takata)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/Make_dos.mak | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 3fc8b88e0c..644573499b 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 49199ae6e7..62271eda08 100644 --- 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, |