From: Bram Moolenaar Date: Sun, 28 Apr 2019 21:07:18 +0000 (+0200) Subject: patch 8.1.1234: swap file test fails on MS-Windows X-Git-Tag: v8.1.1234 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=701df4eb64ae9945c63f83621b54aa69e1336a79;p=thirdparty%2Fvim.git patch 8.1.1234: swap file test fails on MS-Windows Problem: Swap file test fails on MS-Windows. Solution: Only compare the tail of the file names. --- diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index b6bf90c29f..9eda9b223d 100644 --- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -194,7 +194,7 @@ func Test_swapfile_delete() let s:swapname = '' split XswapfileText quit - call assert_equal(swapfile_name, s:swapname) + call assert_equal(fnamemodify(swapfile_name, ':t'), fnamemodify(s:swapname, ':t')) " Write the swapfile with a modified PID, now it will be automatically " deleted. Process one should never be Vim. @@ -211,7 +211,7 @@ func Test_swapfile_delete() let s:swapname = '' split XswapfileText quit - call assert_equal(swapfile_name, s:swapname) + call assert_equal(fnamemodify(swapfile_name, ':t'), fnamemodify(s:swapname, ':t')) call delete('XswapfileText') call delete(swapfile_name) diff --git a/src/version.c b/src/version.c index 48aa464514..c082c065cc 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1234, /**/ 1233, /**/