1
0
forked from aniani/vim

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.
This commit is contained in:
Bram Moolenaar
2022-06-19 20:13:56 +01:00
parent 0f0d3a7fb6
commit e366ed4f2c
4 changed files with 11 additions and 3 deletions

View File

@@ -288,6 +288,12 @@ func GetVimCommand(...)
return cmd return cmd
endfunc 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". " Get the command to run Vim, with --clean instead of "-u NONE".
func GetVimCommandClean() func GetVimCommandClean()
let cmd = GetVimCommand() let cmd = GetVimCommand()

View File

@@ -408,7 +408,7 @@ def Test_Debugger_breakadd_vim9_expr()
# Start Vim in a terminal # Start Vim in a terminal
var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) 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 # Despite the failure the functions are defined
g:RunDbgCmd(buf, ':function g:EarlyFunc', g:RunDbgCmd(buf, ':function g:EarlyFunc',
@@ -434,7 +434,7 @@ def Test_Debugger_break_at_return()
# Start Vim in a terminal # Start Vim in a terminal
var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) 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()', g:RunDbgCmd(buf, ':call GetNum()',
['line 1: return 1 + 2 + 3'], {match: 'pattern'}) ['line 1: return 1 + 2 + 3'], {match: 'pattern'})

View File

@@ -374,7 +374,7 @@ func Test_searchpair_timeout_with_skip()
let ms = 1 let ms = 1
let min_time = 0.001 let min_time = 0.001
let max_time = min_time * 10.0 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 let max_time += 0.04 " this can be slow with valgrind
endif endif
endif endif

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5136,
/**/ /**/
5135, 5135,
/**/ /**/