diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-28 23:07:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-28 23:07:18 +0200 |
| commit | 701df4eb64ae9945c63f83621b54aa69e1336a79 (patch) | |
| tree | 484382a62fa9c31f228e6b6805bbc7c47f950703 | |
| parent | c779c674acfe70e00e9515ef3a7732fd9db62a29 (diff) | |
| download | vim-git-701df4eb64ae9945c63f83621b54aa69e1336a79.tar.gz | |
patch 8.1.1234: swap file test fails on MS-Windowsv8.1.1234
Problem: Swap file test fails on MS-Windows.
Solution: Only compare the tail of the file names.
| -rw-r--r-- | src/testdir/test_swap.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index b6bf90c29..9eda9b223 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 48aa46451..c082c065c 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1234, +/**/ 1233, /**/ 1232, |