From a83d06026d0e0dad873de296bff97707ad2faff3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 2 Jun 2021 16:49:32 +0200 Subject: [PATCH] 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. --- src/testdir/test_startup.vim | 26 ++++++++++++++------------ src/version.c | 2 ++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 4e034ef85d..3cb5a2deb6 100644 --- 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 6761b72d8e..63b3a3ff25 100644 --- 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, /**/ -- 2.47.2