patch 9.0.1675: test may run into timeout when using valgrind
Problem: Test may run into timeout when using valgrind.
Solution: Use a longer timeout when using valgrind.
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 7ad8539..e2bc28d 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -92,6 +92,9 @@
" Common with all tests on all systems.
source setup.vim
+" Needed for RunningWithValgrind().
+source shared.vim
+
" For consistency run all tests with 'nocompatible' set.
" This also enables use of line continuation.
set nocp viminfo+=nviminfo
@@ -219,12 +222,18 @@
func TestTimeout(id)
split test.log
call append(line('$'), '')
- call append(line('$'), 'Test timed out: ' .. g:testfunc)
+
+ let text = 'Test timed out: ' .. g:testfunc
+ if g:timeout_start > 0
+ let text ..= strftime(' after %s seconds', localtime() - g:timeout_start)
+ endif
+ call append(line('$'), text)
write
- call add(v:errors, 'Test timed out: ' . g:testfunc)
+ call add(v:errors, text)
cquit! 42
endfunc
+let g:timeout_start = 0
func RunTheTest(test)
let prefix = ''
@@ -237,7 +246,9 @@
if has('timers')
" No test should take longer than 30 seconds. If it takes longer we
" assume we are stuck and need to break out.
- let test_timeout_timer = timer_start(30000, 'TestTimeout')
+ let test_timeout_timer =
+ \ timer_start(RunningWithValgrind() ? 50000 : 30000, 'TestTimeout')
+ let g:timeout_start = localtime()
endif
" Avoid stopping at the "hit enter" prompt
@@ -307,6 +318,7 @@
if has('timers')
call timer_stop(test_timeout_timer)
+ let g:timeout_start = 0
endif
" Clear any autocommands and put back the catch-all for SwapExists.
@@ -371,7 +383,7 @@
" close any split windows
while winnr('$') > 1
- bwipe!
+ noswapfile bwipe!
endwhile
" May be editing some buffer, wipe it out. Then we may end up in another
diff --git a/src/version.c b/src/version.c
index cf84514..bacb9fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1675,
+/**/
1674,
/**/
1673,