forked from aniani/vim
patch 9.0.0545: when a test is slow and CI times out there is no time info
Problem: When a test is slow and CI times out there is no time info. Solution: Add the elapsed time to the "Executing" message.
This commit is contained in:
@@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime
|
|||||||
# Comment out this line to see the verbose output of tests.
|
# Comment out this line to see the verbose output of tests.
|
||||||
#
|
#
|
||||||
# Catches SwapExists to avoid hanging at the ATTENTION prompt.
|
# Catches SwapExists to avoid hanging at the ATTENTION prompt.
|
||||||
REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C LANG=C LANGUAGE=C awk '/Executing Test_/{match($$0, "Executing Test_[^\\)]*\\)"); print substr($$0, RSTART, RLENGTH) "\r"; fflush()}'
|
REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C LANG=C LANGUAGE=C awk '/Executing Test_/{match($$0, "(took .*; now )?Executing Test_[^\\)]*\\)"); print substr($$0, RSTART, RLENGTH) "\r"; fflush()}'
|
||||||
|
|
||||||
# Uncomment this line to use valgrind for memory leaks and extra warnings.
|
# Uncomment this line to use valgrind for memory leaks and extra warnings.
|
||||||
# The output goes into a file "valgrind.testN"
|
# The output goes into a file "valgrind.testN"
|
||||||
@@ -20,6 +20,9 @@ REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' | LC_ALL=C L
|
|||||||
# This will make testing about 10 times as slow.
|
# This will make testing about 10 times as slow.
|
||||||
# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=35 --log-file=valgrind.$*
|
# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=35 --log-file=valgrind.$*
|
||||||
|
|
||||||
|
# To execute one test, e.g. in gdb, use something like this:
|
||||||
|
# run -f -u unix.vim --gui-dialog-file guidialog -U NONE --noplugin --not-a-term -S runtest.vim test_name.vim
|
||||||
|
|
||||||
default: nongui
|
default: nongui
|
||||||
|
|
||||||
# The list of tests is common to all systems.
|
# The list of tests is common to all systems.
|
||||||
|
@@ -173,11 +173,15 @@ function GetAllocId(name)
|
|||||||
return lnum - top - 1
|
return lnum - top - 1
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
let g:func_start = reltime()
|
||||||
|
|
||||||
func RunTheTest(test)
|
func RunTheTest(test)
|
||||||
echoconsole 'Executing ' . a:test
|
let prefix = ''
|
||||||
if has('reltime')
|
if has('reltime')
|
||||||
let func_start = reltime()
|
let prefix = 'took ' .. reltimestr(reltime(g:func_start)) .. '; now '
|
||||||
|
let g:func_start = reltime()
|
||||||
endif
|
endif
|
||||||
|
echoconsole prefix .. 'Executing ' .. a:test
|
||||||
|
|
||||||
" Avoid stopping at the "hit enter" prompt
|
" Avoid stopping at the "hit enter" prompt
|
||||||
set nomore
|
set nomore
|
||||||
@@ -292,7 +296,7 @@ func RunTheTest(test)
|
|||||||
let message = 'Executed ' . a:test
|
let message = 'Executed ' . a:test
|
||||||
if has('reltime')
|
if has('reltime')
|
||||||
let message ..= repeat(' ', 50 - len(message))
|
let message ..= repeat(' ', 50 - len(message))
|
||||||
let time = reltime(func_start)
|
let time = reltime(g:func_start)
|
||||||
if reltimefloat(time) > 0.1
|
if reltimefloat(time) > 0.1
|
||||||
let message = s:t_bold .. message
|
let message = s:t_bold .. message
|
||||||
endif
|
endif
|
||||||
|
@@ -699,6 +699,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 */
|
||||||
|
/**/
|
||||||
|
545,
|
||||||
/**/
|
/**/
|
||||||
544,
|
544,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user