summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-05-27 20:13:28 +0100
committerBram Moolenaar <Bram@vim.org>2022-05-27 20:13:28 +0100
commit76381a5b4f3f6de1df33a8ab3e1f7db2e1764af6 (patch)
treeaeacd5b725e9c59b75d02496dd95e31ae937ce07
parente0ff3a7de6030b73d94121626deb8229e66e82b2 (diff)
downloadvim-git-76381a5b4f3f6de1df33a8ab3e1f7db2e1764af6.tar.gz
patch 8.2.5031: cannot easily run the benchmarksv8.2.5031
Problem: Cannot easily run the benchmarks. Solution: Have "make benchmark" in the src directory work.
-rw-r--r--src/Makefile5
-rw-r--r--src/testdir/Makefile4
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 1 deletions
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
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5031,
+/**/
5030,
/**/
5029,