aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/old/testdir/test_swap.vim8
-rw-r--r--test/old/testdir/test_vimscript.vim3
2 files changed, 8 insertions, 3 deletions
diff --git a/test/old/testdir/test_swap.vim b/test/old/testdir/test_swap.vim
index 2786807e2e..fac1893e4c 100644
--- a/test/old/testdir/test_swap.vim
+++ b/test/old/testdir/test_swap.vim
@@ -116,16 +116,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/test/old/testdir/test_vimscript.vim b/test/old/testdir/test_vimscript.vim
index 81ccee9f13..fe6c4c2391 100644
--- a/test/old/testdir/test_vimscript.vim
+++ b/test/old/testdir/test_vimscript.vim
@@ -5983,6 +5983,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