diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-15 16:34:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-15 16:34:21 +0200 |
| commit | bffc50494d52a3690cbbc5c7b34a835f9153184e (patch) | |
| tree | 36d52c20bb3b7ea379e265123b7d3a86f53e36cd | |
| parent | 0abb4273f6c14f9ebca8be67d42c6e67b4f612cf (diff) | |
patch 8.1.1541: check for ASAN is not reliablev8.1.1541
Problem: Check for ASAN is not reliable.
Solution: Check the version output. (Dominique Pelle, closes #4543)
| -rw-r--r-- | src/testdir/test_memory_usage.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim index eadd4ea970..519ac4b9a3 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 7e9cac3f24..abafa7e921 100644 --- 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, |