GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 09:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.2045: tests: checking for swap files takes time

Browse Source 
Problem:  tests: checking for swap files takes time
Solution: don't check for swap files  when test has been skipped

Check for swap files takes a considerable about of time, so don't do
that for skipped tests to avoid wasting time.

closes: #13371

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
zeertzjq
2023-10-18 11:50:37 +02:00
committed by Christian Brabandt
parent 0672595fd5
commit a0e1f06f04
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/testdir/runtest.vim
View File

@ -277,6 +277,8 @@ func RunTheTest(test)
endtry endtry
endif endif
let skipped = v:false
au VimLeavePre * call EarlyExit(g:testfunc) au VimLeavePre * call EarlyExit(g:testfunc)
if a:test =~ 'Test_nocatch_' if a:test =~ 'Test_nocatch_'
" Function handles errors itself. This avoids skipping commands after the " Function handles errors itself. This avoids skipping commands after the
@ -286,6 +288,7 @@ func RunTheTest(test)
if g:skipped_reason != '' if g:skipped_reason != ''
call add(s:messages, ' Skipped') call add(s:messages, ' Skipped')
call add(s:skipped, 'SKIPPED ' . a:test . ': ' . g:skipped_reason) call add(s:skipped, 'SKIPPED ' . a:test . ': ' . g:skipped_reason)
let skipped = v:true
endif endif
else else
try try
@ -293,6 +296,7 @@ func RunTheTest(test)
catch /^\cskipped/ catch /^\cskipped/
call add(s:messages, ' Skipped') call add(s:messages, ' Skipped')
call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', '')) call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', ''))
let skipped = v:true
catch catch
call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint) call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
endtry endtry
@ -400,14 +404,16 @@ func RunTheTest(test)
endif endif
endwhile endwhile
" Check if the test has left any swap files behind. Delete them before if !skipped
" running tests again, they might interfere. " Check if the test has left any swap files behind. Delete them before
let swapfiles = s:GetSwapFileList() " running tests again, they might interfere.
if len(swapfiles) > 0 let swapfiles = s:GetSwapFileList()
call add(s:messages, "Found swap files: " .. string(swapfiles)) if len(swapfiles) > 0
for name in swapfiles call add(s:messages, "Found swap files: " .. string(swapfiles))
call delete(name) for name in swapfiles
endfor call delete(name)
endfor
endif
endif endif
endfunc endfunc

2
src/version.c
View File

@ -704,6 +704,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 */
/**/
2045,
/**/ /**/
2044, 2044,
/**/ /**/