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 eadd4ea9700721775ba5e32bff878fc15c3edeb0..519ac4b9a361d686004d409db090e08b40366a3f 100644 (file)
--- 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 7e9cac3f24d59e403fd291e3ace37fcdf6799a9b..abafa7e921f0628196c874daec06a29e247111ad 100644 (file)
--- 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,
 /**/