Skip to content

Commit 83497f8

Browse files
committed
patch 8.2.5105: test still hangs on MS-Windows
Problem: Test still hangs on MS-Windows. Solution: Skip "nocatch" test the right way.
1 parent b31cb04 commit 83497f8

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

src/testdir/test_retab.vim

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@ func RetabLoop()
9292
endfunc
9393

9494
func Test_retab_endless()
95-
" FIXME: why does this hang on MS-Windows?
96-
CheckNotMSWindows
97-
9895
" inside try/catch we catch the error message
99-
new
10096
call setline(1, "\t0\t")
10197
let caught = 'no'
10298
try
@@ -105,20 +101,21 @@ func Test_retab_endless()
105101
let caught = v:exception
106102
endtry
107103
call assert_match('E1240:', caught)
108-
bwipe!
104+
109105
set tabstop&
110106
endfunc
111107

112108
func Test_nocatch_retab_endless()
113-
" FIXME: does this hang on MS-Windows?
114-
CheckNotMSWindows
109+
" FIXME: why does this hang on MS-Windows? Is got_int reset somewhere?
110+
if has('win32')
111+
let g:skipped_reason = "does not work on MS-Windows"
112+
return
113+
endif
115114

116115
" not inside try/catch an interrupt is generated to get out of loops
117-
new
118116
call setline(1, "\t0\t")
119117
call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted'])
120118

121-
bwipe!
122119
set tabstop&
123120
endfunc
124121

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
5105,
737739
/**/
738740
5104,
739741
/**/

0 commit comments

Comments
 (0)