From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 15 Jun 2019 14:34:21 +0000 (+0200)
Subject: patch 8.1.1541: check for ASAN is not reliable
X-Git-Tag: v8.1.1541
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bffc50494d52a3690cbbc5c7b34a835f9153184e;p=vim

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 #4543)
---

diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim
index eadd4ea97..519ac4b9a 100644
--- 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,]*\<address\>'
   " 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
index 7e9cac3f2..abafa7e92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1541,
 /**/
     1540,
 /**/