Patch 8.2.5136
Problem: Debugger test fails when run with valgrind.
Solution: Wait longer when using valgrind.
Files: src/testdir/shared.vim, src/testdir/test_debugger.vim,
src/testdir/test_search.vim
*** ../vim-8.2.5135/src/testdir/shared.vim 2022-06-13 21:42:40.949531347
+0100
--- src/testdir/shared.vim 2022-06-19 19:49:47.308828249 +0100
***************
*** 288,293 ****
--- 288,299 ----
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()
*** ../vim-8.2.5135/src/testdir/test_debugger.vim 2022-05-06
13:14:43.793076613 +0100
--- src/testdir/test_debugger.vim 2022-06-19 20:11:08.726952545 +0100
***************
*** 408,414 ****
# Start Vim in a terminal
var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0})
! call g:TermWait(buf)
# Despite the failure the functions are defined
g:RunDbgCmd(buf, ':function g:EarlyFunc',
--- 408,414 ----
# Start Vim in a terminal
var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0})
! call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
# Despite the failure the functions are defined
g:RunDbgCmd(buf, ':function g:EarlyFunc',
***************
*** 434,440 ****
# Start Vim in a terminal
var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0})
! call g:TermWait(buf)
g:RunDbgCmd(buf, ':call GetNum()',
['line 1: return 1 + 2 + 3'], {match: 'pattern'})
--- 434,440 ----
# Start Vim in a terminal
var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0})
! call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50)
g:RunDbgCmd(buf, ':call GetNum()',
['line 1: return 1 + 2 + 3'], {match: 'pattern'})
*** ../vim-8.2.5135/src/testdir/test_search.vim 2022-06-19 17:05:43.841167033
+0100
--- src/testdir/test_search.vim 2022-06-19 19:51:26.289182792 +0100
***************
*** 374,380 ****
let ms = 1
let min_time = 0.001
let max_time = min_time * 10.0
! if GetVimCommand() =~ 'valgrind.*--log-file='
let max_time += 0.04 " this can be slow with valgrind
endif
endif
--- 374,380 ----
let ms = 1
let min_time = 0.001
let max_time = min_time * 10.0
! if RunningWithValgrind()
let max_time += 0.04 " this can be slow with valgrind
endif
endif
*** ../vim-8.2.5135/src/version.c 2022-06-19 18:02:01.272100170 +0100
--- src/version.c 2022-06-19 20:12:34.631006138 +0100
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 5136,
/**/
--
"Beware of bugs in the above code; I have only proved
it correct, not tried it." -- Donald Knuth
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220619191431.3CABD1C075E%40moolenaar.net.
