diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-12-05 15:01:05 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-05 15:01:05 +0000 |
| commit | 6cf3151f0e3839332c89367b7384c395a1185927 (patch) | |
| tree | 3f062b09dacda5b657e2b84c50196c9faebb1169 | |
| parent | c216a7a21a25a701b84b79abc1ba6ab0baa3a311 (diff) | |
patch 9.0.1008: test for swapfilelist() fails on MS-Windowsv9.0.1008
Problem: Test for swapfilelist() fails on MS-Windows.
Solution: Only check the tail of the path. Mark a test as flaky.
| -rw-r--r-- | src/testdir/test_swap.vim | 8 | ||||
| -rw-r--r-- | src/testdir/test_vimscript.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index c776ca57ce..7532655a36 100644 --- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -111,16 +111,18 @@ func Test_swapinfo() let fname = s:swapname() call assert_match('Xswapinfo', fname) + " Check the tail appears in the list from swapfilelist(). The path depends + " on the system. + let tail = fnamemodify(fname, ":t")->fnameescape() let nr = 0 for name in swapfilelist() - if name =~ '[\\/]' .. fname .. '$' + if name =~ tail .. '$' let nr += 1 endif endfor - call assert_equal(1, nr) + call assert_equal(1, nr, 'not found in ' .. string(swapfilelist())) let info = fname->swapinfo() - let ver = printf('VIM %d.%d', v:version / 100, v:version % 100) call assert_equal(ver, info.version) diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index a23bac3d3e..5599754c7b 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -5977,6 +5977,9 @@ endfunc " interrupt right before a catch is invoked in a script func Test_ignore_catch_after_intr_1() + " for unknown reasons this test sometimes fails on MS-Windows. + let g:test_is_flaky = 1 + XpathINIT let lines =<< trim [CODE] try diff --git a/src/version.c b/src/version.c index 4a15f431e0..ce1aba06d4 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1008, +/**/ 1007, /**/ 1006, |