summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile3
-rw-r--r--src/testdir/Makefile1
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index c32ea0840b..b110f91135 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -696,7 +696,8 @@ LINT_OPTIONS = -beprxzF
# More at: https://code.google.com/p/address-sanitizer/
# Useful environment variables:
# $ export ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
-# $ export LSAN_OPTIONS="suppressions=$cwd/testdir/lsan-suppress.txt"
+# $ export LSAN_OPTIONS="suppressions=`pwd`/testdir/lsan-suppress.txt"
+# When running tests output can be found in testdir/asan.*
#SANITIZER_CFLAGS = -g -O0 -fsanitize=address -fno-omit-frame-pointer
#SANITIZER_CFLAGS = -g -O0 -fsanitize=undefined -fno-omit-frame-pointer
SANITIZER_LIBS = $(SANITIZER_CFLAGS)
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 92506e6f41..7f9ef04342 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -100,6 +100,7 @@ clean:
-rm -f opt_test.vim test.log test_result.log messages
-rm -f $(RM_ON_RUN) $(RM_ON_START)
-rm -f valgrind.*
+ -rm -f asan.*
test1.out: test1.in
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
diff --git a/src/version.c b/src/version.c
index a46ffb46fa..e446e6bfa9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 621,
+/**/
620,
/**/
619,