diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-02 16:49:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-02 16:49:32 +0200 |
| commit | a83d06026d0e0dad873de296bff97707ad2faff3 (patch) | |
| tree | 9612f53842d4ade4e64970711bdd1c2cbc68395b | |
| parent | c3cb1c92a335be818971acd89f631e82aa30ad3f (diff) | |
| download | vim-git-a83d06026d0e0dad873de296bff97707ad2faff3.tar.gz | |
patch 8.2.2927: test commented out because it fails with ASANv8.2.2927
Problem: Test commented out because it fails with ASAN.
Solution: Only skip the test when running with ASAN.
| -rw-r--r-- | src/testdir/test_startup.vim | 26 | ||||
| -rw-r--r-- | 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 4e034ef85..3cb5a2deb 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 6761b72d8..63b3a3ff2 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2927, +/**/ 2926, /**/ 2925, |