Mercurial > vim
changeset 29234:96ff6c230a66 v8.2.5136
patch 8.2.5136: debugger test fails when run with valgrind
Commit: https://github.com/vim/vim/commit/e366ed4f2c6fa8cb663f1b9599b39d57ddbd8a2a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 19 20:13:56 2022 +0100
patch 8.2.5136: debugger test fails when run with valgrind
Problem: Debugger test fails when run with valgrind.
Solution: Wait longer when using valgrind.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 19 Jun 2022 21:15:03 +0200 |
| parents | 3f3fbde94888 |
| children | fbcbc953c2ec |
| files | src/testdir/shared.vim src/testdir/test_debugger.vim src/testdir/test_search.vim src/version.c |
| diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -288,6 +288,12 @@ func GetVimCommand(...) return cmd endfunc +" Return one when it looks like the tests are run with valgrind, which means +" that everything is much slower. +func RunningWithValgrind() + return GetVimCommand() =~ '\<valgrind\>' +endfunc + " Get the command to run Vim, with --clean instead of "-u NONE". func GetVimCommandClean() let cmd = GetVimCommand()
--- a/src/testdir/test_debugger.vim +++ b/src/testdir/test_debugger.vim @@ -408,7 +408,7 @@ def Test_Debugger_breakadd_vim9_expr() # Start Vim in a terminal var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) - call g:TermWait(buf) + call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50) # Despite the failure the functions are defined g:RunDbgCmd(buf, ':function g:EarlyFunc', @@ -434,7 +434,7 @@ def Test_Debugger_break_at_return() # Start Vim in a terminal var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) - call g:TermWait(buf) + call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50) g:RunDbgCmd(buf, ':call GetNum()', ['line 1: return 1 + 2 + 3'], {match: 'pattern'})
--- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -374,7 +374,7 @@ func Test_searchpair_timeout_with_skip() let ms = 1 let min_time = 0.001 let max_time = min_time * 10.0 - if GetVimCommand() =~ 'valgrind.*--log-file=' + if RunningWithValgrind() let max_time += 0.04 " this can be slow with valgrind endif endif