diff --git a/src/Makefile b/src/Makefile index d15e314ef..939912148 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2245,8 +2245,11 @@ testgui: testtiny: cd testdir; $(MAKE) -f Makefile tiny VIMPROG=../$(VIMTARGET) SCRIPTSOURCE=../$(SCRIPTSOURCE) +# Run benchmarks. benchmark: - cd testdir; $(MAKE) -f Makefile benchmark VIMPROG=../$(VIMTARGET) SCRIPTSOURCE=../$(SCRIPTSOURCE) + cd testdir; \ + $(MAKE) -f Makefile benchmarkclean; \ + $(MAKE) -f Makefile benchmark VIMPROG=../$(VIMTARGET) SCRIPTSOURCE=../$(SCRIPTSOURCE) unittesttargets: $(MAKE) -f Makefile $(UNITTEST_TARGETS) diff --git a/src/testdir/Makefile b/src/testdir/Makefile index c54e0604b..c782da9df 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -90,6 +90,10 @@ clean: -rm -f valgrind.* -rm -f asan.* +# Delete the files produced by benchmarking, so they can run again. +benchmarkclean: + rm -f $(SCRIPTS_BENCH) + nolog: -rm -f test.log test_result.log messages diff --git a/src/version.c b/src/version.c index cc3542a31..999cfde68 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5031, /**/ 5030, /**/