summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-15 16:19:50 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-15 16:19:50 +0100
commitacecb3b9359dced16b471b9950594394183c503a (patch)
treed1ea9823ad984d580af7ddb3455f7bb7d58c3170
parent21e551cce26ea6ff389b6c90f1945facf1a8a066 (diff)
patch 8.1.0597: cannot run test_libvterm from the top directoryv8.1.0597
Problem: Cannot run test_libvterm from the top directory. Solution: Add test target in toplevel Makefile.
-rw-r--r--Makefile6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4a7c4c6642..3e69d4501c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ first:
# Some make programs use the last target for the $@ default; put the other
# targets separately to always let $@ expand to "first" by default.
-all install uninstall tools config configure reconfig proto depend lint tags types test scripttests unittests testclean clean distclean:
+all install uninstall tools config configure reconfig proto depend lint tags types test scripttests test_libvterm unittests testclean clean distclean:
@if test ! -f src/auto/config.mk; then \
cp src/config.mk.dist src/auto/config.mk; \
fi
@@ -40,6 +40,10 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
@echo "If there are problems, cd to the src directory and run make there"
cd src && $(MAKE) $@
+test: all
+ cd src && $(MAKE) test
+ cd runtime/indent && $(MAKE) clean && $(MAKE) test
+
#########################################################################
# 2. Creating the various distribution files.
diff --git a/src/version.c b/src/version.c
index 577be31d96..a85295a6cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 597,
+/**/
596,
/**/
595,