diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-15 22:11:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-15 22:11:45 +0100 |
| commit | 83497f875881973df772cc4cc593766345df6c4a (patch) | |
| tree | b74329d9c9bb4c81d77a187cd10d6ab77570d98e | |
| parent | b31cb04771234556374cda45ce19dabd4a2a7fc7 (diff) | |
patch 8.2.5105: test still hangs on MS-Windowsv8.2.5105
Problem: Test still hangs on MS-Windows.
Solution: Skip "nocatch" test the right way.
| -rw-r--r-- | src/testdir/test_retab.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/testdir/test_retab.vim b/src/testdir/test_retab.vim index 3bd8a9928c..4253e77487 100644 --- a/src/testdir/test_retab.vim +++ b/src/testdir/test_retab.vim @@ -92,11 +92,7 @@ func RetabLoop() endfunc func Test_retab_endless() - " FIXME: why does this hang on MS-Windows? - CheckNotMSWindows - " inside try/catch we catch the error message - new call setline(1, "\t0\t") let caught = 'no' try @@ -105,20 +101,21 @@ func Test_retab_endless() let caught = v:exception endtry call assert_match('E1240:', caught) - bwipe! + set tabstop& endfunc func Test_nocatch_retab_endless() - " FIXME: does this hang on MS-Windows? - CheckNotMSWindows + " FIXME: why does this hang on MS-Windows? Is got_int reset somewhere? + 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 - new call setline(1, "\t0\t") call assert_fails('call RetabLoop()', ['E1240:', 'Interrupted']) - bwipe! set tabstop& endfunc diff --git a/src/version.c b/src/version.c index 1e6d82a6ab..4672f0e937 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5105, +/**/ 5104, /**/ 5103, |