thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.5105: test still hangs on MS-Windows

Browse Source 
Problem:    Test still hangs on MS-Windows.
Solution:   Skip "nocatch" test the right way.
This commit is contained in:
Bram Moolenaar 2022-06-15 22:11:45 +01:00
parent b31cb04771
commit 83497f8758
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/testdir/test_retab.vim
View File

@ -92,11 +92,7 @@ func RetabLoop()
endfunc endfunc
func Test_retab_endless() func Test_retab_endless()
" FIXME: why does this hang on MS-Windows?
CheckNotMSWindows
" inside try/catch we catch the error message " inside try/catch we catch the error message
new
call setline(1, "\t0\t") call setline(1, "\t0\t")
let caught = 'no' let caught = 'no'
try try
@ -105,20 +101,21 @@ func Test_retab_endless()
let caught = v:exception let caught = v:exception
endtry endtry
call assert_match('E1240:', caught) call assert_match('E1240:', caught)
bwipe!
set tabstop& set tabstop&
endfunc endfunc
func Test_nocatch_retab_endless() func Test_nocatch_retab_endless()
" FIXME: does this hang on MS-Windows? " FIXME: why does this hang on MS-Windows? Is got_int reset somewhere?
CheckNotMSWindows if has('win32')
let g:skipped_reason = "does not work on MS-Windows"
return
endif
" not inside try/catch an interrupt is generated to get out of loops " not inside try/catch an interrupt is generated to get out of loops
new
call setline(1, "\t0\t") call setline(1, "\t0\t")
call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted']) call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted'])
bwipe!
set tabstop& set tabstop&
endfunc endfunc

2
src/version.c
View File

@ -734,6 +734,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 */
/**/
5105,
/**/ /**/
5104, 5104,
/**/ /**/