diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-10-18 11:50:37 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-10-18 11:50:37 +0200 |
| commit | a0e1f06f04da3444e278ddf47e2ea3d5857a7dec (patch) | |
| tree | af657a2c89d454ca2fb3952db7c44866ad6fcc98 /src | |
| parent | 0672595fd50e9ae668676a40e28ebf66d7f52392 (diff) | |
patch 9.0.2045: tests: checking for swap files takes timev9.0.2045
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/runtest.vim | 22 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 0d79bef3bf..d5765d1a8b 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -277,6 +277,8 @@ func RunTheTest(test) endtry endif + let skipped = v:false + au VimLeavePre * call EarlyExit(g:testfunc) if a:test =~ 'Test_nocatch_' " Function handles errors itself. This avoids skipping commands after the @@ -286,6 +288,7 @@ func RunTheTest(test) if g:skipped_reason != '' call add(s:messages, ' Skipped') call add(s:skipped, 'SKIPPED ' . a:test . ': ' . g:skipped_reason) + let skipped = v:true endif else try @@ -293,6 +296,7 @@ func RunTheTest(test) catch /^\cskipped/ call add(s:messages, ' Skipped') call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', '')) + let skipped = v:true catch call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint) endtry @@ -400,14 +404,16 @@ func RunTheTest(test) endif endwhile - " Check if the test has left any swap files behind. Delete them before - " running tests again, they might interfere. - let swapfiles = s:GetSwapFileList() - if len(swapfiles) > 0 - call add(s:messages, "Found swap files: " .. string(swapfiles)) - for name in swapfiles - call delete(name) - endfor + if !skipped + " Check if the test has left any swap files behind. Delete them before + " running tests again, they might interfere. + let swapfiles = s:GetSwapFileList() + if len(swapfiles) > 0 + call add(s:messages, "Found swap files: " .. string(swapfiles)) + for name in swapfiles + call delete(name) + endfor + endif endif endfunc diff --git a/src/version.c b/src/version.c index 6a820828bf..c0df1b5b6b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2045, +/**/ 2044, /**/ 2043, |