patch 8.2.2927: test commented out because it fails with ASAN

Problem:    Test commented out because it fails with ASAN.
Solution:   Only skip the test when running with ASAN.

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 4e034ef85d034ae3da6db80b142dea493e39bc62..3cb5a2deb6aaa4a8edd573edcda4e22901209bad 100644 (file)
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -277,18 +277,20 @@ func Test_V_arg()
 endfunc
 
 " Test that an error is shown when the defaults.vim file could not be read
-" TODO: disabled - this causes ASAN errors for unknown reasons
-"func Test_defaults_error()
-"  " Can't catch the output of gvim.
-"  CheckNotGui
-"  CheckNotMSWindows
-"
-"  let out = system('VIMRUNTIME=/tmp ' .. GetVimCommand() .. ' --clean -cq')
-"  call assert_match("E1187: Failed to source defaults.vim", out)
-"
-"  let out = system('VIMRUNTIME=/tmp ' .. GetVimCommand() .. ' -u DEFAULTS -cq')
-"  call assert_match("E1187: Failed to source defaults.vim", out)
-"endfunc
+func Test_defaults_error()
+  " Can't catch the output of gvim.
+  CheckNotGui
+  CheckNotMSWindows
+  " For unknown reasons freeing all memory does not work here, even though
+  " EXITFREE is defined.
+  CheckNotAsan
+
+  let out = system('VIMRUNTIME=/tmp ' .. GetVimCommand() .. ' --clean -cq')
+  call assert_match("E1187: Failed to source defaults.vim", out)
+
+  let out = system('VIMRUNTIME=/tmp ' .. GetVimCommand() .. ' -u DEFAULTS -cq')
+  call assert_match("E1187: Failed to source defaults.vim", out)
+endfunc
 
 " Test the '-q [errorfile]' argument.
 func Test_q_arg()

diff --git a/src/version.c b/src/version.c
index 6761b72d8ed91c40f53269ff73e7434ca4ce8c1e..63b3a3ff251d97078cef9df51d48eba7ab493ca5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2927,
 /**/
     2926,
 /**/