# HG changeset patch # User Bram Moolenaar # Date 1560609904 -7200 # Node ID 6641a15f999d285f3590886ef0f96a4b8cf862ad # Parent 76f837f6d427638d51a780979d4036345e590b65 patch 8.1.1541: check for ASAN is not reliable commit https://github.com/vim/vim/commit/bffc50494d52a3690cbbc5c7b34a835f9153184e Author: Bram Moolenaar Date: Sat Jun 15 16:34:21 2019 +0200 patch 8.1.1541: check for ASAN is not reliable Problem: Check for ASAN is not reliable. Solution: Check the version output. (Dominique Pelle, closes https://github.com/vim/vim/issues/4543) diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim --- a/src/testdir/test_memory_usage.vim +++ b/src/testdir/test_memory_usage.vim @@ -6,7 +6,7 @@ endif if has('gui_running') throw 'Skipped, does not work in GUI' endif -if $ASAN_OPTIONS !=# '' +if execute('version') =~# '-fsanitize=[a-z,]*\' " Skip tests on Travis CI ASAN build because it's difficult to estimate " memory usage. throw 'Skipped, does not work with ASAN' diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1541, +/**/ 1540, /**/ 1539,