mirror of
https://github.com/vim/vim.git
synced 2025-10-03 05:14:07 -04:00
patch 8.2.2589: recover test hangs in the GUI
Problem: Recover test hangs in the GUI. Solution: Add g:skipped_reason to skip a _nocatch_ test.
This commit is contained in:
@@ -196,7 +196,12 @@ func RunTheTest(test)
|
|||||||
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
|
||||||
" error.
|
" error.
|
||||||
|
let g:skipped_reason = ''
|
||||||
exe 'call ' . a:test
|
exe 'call ' . a:test
|
||||||
|
if g:skipped_reason != ''
|
||||||
|
call add(s:messages, ' Skipped')
|
||||||
|
call add(s:skipped, 'SKIPPED ' . a:test . ': ' . g:skipped_reason)
|
||||||
|
endif
|
||||||
else
|
else
|
||||||
try
|
try
|
||||||
au VimLeavePre * call EarlyExit(g:testfunc)
|
au VimLeavePre * call EarlyExit(g:testfunc)
|
||||||
|
@@ -80,9 +80,15 @@ endfunc
|
|||||||
|
|
||||||
func Test_nocatch_process_still_running()
|
func Test_nocatch_process_still_running()
|
||||||
" sysinfo.uptime probably only works on Linux
|
" sysinfo.uptime probably only works on Linux
|
||||||
CheckLinux
|
if !has('linux')
|
||||||
|
let g:skipped_reason = 'only works on Linux'
|
||||||
|
return
|
||||||
|
endif
|
||||||
" the GUI dialog can't be handled
|
" the GUI dialog can't be handled
|
||||||
CheckNotGui
|
if has('gui_running')
|
||||||
|
let g:skipped_reason = 'only works in the terminal'
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
|
||||||
" don't intercept existing swap file here
|
" don't intercept existing swap file here
|
||||||
au! SwapExists
|
au! SwapExists
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
2589,
|
||||||
/**/
|
/**/
|
||||||
2588,
|
2588,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user