summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-17 21:25:08 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-17 21:25:08 +0100
commit9e27217c489c6eca2bd98d1c9fa89c1b652ed792 (patch)
tree1af6949cec7101e331201915a35c302fca3e9cfc
parent7567d0b115e332f61a9f390aaccdf7825b891227 (diff)
patch 8.0.1306: ASAN error stack trace is not usefulv8.0.1306
Problem: ASAN error stack trace is not useful. Solution: Add "asan_symbolize". (James McCoy, closes #2344)
-rw-r--r--.travis.yml4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b3ecd091c4..a2b074bde8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,6 +67,7 @@ addons:
apt:
packages:
- autoconf
+ - clang
- lcov
- libperl-dev
- python-dev
@@ -102,9 +103,8 @@ script:
- (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && if [ "$BUILD" = "yes" ]; then make -j$NPROC; fi)
# Show Vim version and also if_xx versions.
- if [ "$BUILD" = "yes" ]; then ${SRCDIR}/vim --version; ${SRCDIR}/vim --not-a-term -u NONE -S ${SRCDIR}/testdir/if_ver-1.vim -c quit > /dev/null; ${SRCDIR}/vim --not-a-term -u NONE -S ${SRCDIR}/testdir/if_ver-2.vim -c quit > /dev/null; cat if_ver.txt; fi
- - if [ -n "$ASAN_OPTIONS" ]; then export PATH=/usr/lib/llvm-$(clang -v 2>&1 | sed -n 's/.*version \([1-9]\.[0-9][0-9]*\).*/\1/p')/bin:$PATH; fi
- make $SHADOWOPT $TEST
- - if [ -n "$ASAN_OPTIONS" ]; then for log in $(find -type f -name 'asan.*' -size +0); do cat "$log"; err=1; done; fi
+ - if [ -n "$ASAN_OPTIONS" ]; then for log in $(find -type f -name 'asan.*' -size +0); do asan_symbolize < "$log"; err=1; done; fi
- if [ -n "$err" ]; then exit 1; fi
after_success:
diff --git a/src/version.c b/src/version.c
index 1cffd61817..c07635c3b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1306,
+/**/
1305,
/**/
1304,