patch 8.2.5031: cannot easily run the benchmarks

Problem:    Cannot easily run the benchmarks.
Solution:   Have "make benchmark" in the src directory work.

diff --git a/src/Makefile b/src/Makefile
index d15e314efadde51f265e99a0d95e5762ec8b1bf3..939912148fe28e05e8dfa7a04dffd2e9af12ed99 100644 (file)
--- 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 c54e0604bfadd148c03f1160c5a57d4a422972cf..c782da9dfe3ee00e5600fec896787a10cf49203f 100644 (file)
--- 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 cc3542a314f0efa15655eb9fc7760403e42e196a..999cfde686c836fb7b5773c3c1804e8ac75ef64b 100644 (file)
--- 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,
 /**/