From e5bae13da327235836b505ee47224b465713ad75 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 2 Apr 2020 15:17:32 +0200 Subject: [PATCH] patch 8.2.0497: too verbose output from the asan build in Travis Problem: Too verbose output from the asan build in Travis. Solution: Filter out suppression messages. (Ozaki Kiichi, closes #5874) --- .travis.yml | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4fe2ebdd2..f3da2d10a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ _anchors: # Update pyenv to fix the error "/opt/pyenv/libexec/pyenv: line 43: cd: asan_symbolize-6.0: Not a directory". # https://github.com/pyenv/pyenv/issues/580 - (cd "${PYENV_ROOT}" && git fetch -p origin && git checkout "$(git rev-list --tags -n1)") &>/dev/null || true - - find . -type f -name 'asan.*' -size +0 2>/dev/null | xargs -I{} -n1 -t asan_symbolize -l{} + - find . -type f -name 'asan.*' -size +0 2>/dev/null | xargs grep -l '^==[[:digit:]]*==ERROR:' | xargs -I{} -n1 -t asan_symbolize -l{} branches: except: diff --git a/src/version.c b/src/version.c index 8973af793c..9ceed5a952 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 497, /**/ 496, /**/