# HG changeset patch # User Bram Moolenaar # Date 1663961404 -7200 # Node ID c9d72c379cec17c6f490eaf1554977ec276730db # Parent 800b2f95f159bfc346b825c1eb10e2a0afd064ff patch 9.0.0561: when a test gets stuck it just hangs forever Commit: https://github.com/vim/vim/commit/3bcd0ddc2deb34794c735c6ea0b8f964b510c6db Author: Bram Moolenaar Date: Fri Sep 23 20:25:55 2022 +0100 patch 9.0.0561: when a test gets stuck it just hangs forever Problem: When a test gets stuck it just hangs forever. Solution: Set a timeout of 30 seconds. diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -186,6 +186,17 @@ if has('reltime') let g:func_start = reltime() endif +" Invoked when a test takes too much time. +func TestTimeout(id) + split test.log + call append(line('$'), '') + call append(line('$'), 'Test timed out: ' .. g:testfunc) + write + call add(v:errors, 'Test timed out: ' . g:testfunc) + + cquit! 42 +endfunc + func RunTheTest(test) let prefix = '' if has('reltime') @@ -194,6 +205,12 @@ func RunTheTest(test) endif echoconsole prefix .. 'Executing ' .. a:test + 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') + endif + " Avoid stopping at the "hit enter" prompt set nomore @@ -259,6 +276,10 @@ func RunTheTest(test) endtry endif + if has('timers') + call timer_stop(test_timeout_timer) + endif + " Clear any autocommands and put back the catch-all for SwapExists. au! au SwapExists * call HandleSwapExists() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 561, +/**/ 560, /**/ 559,