changeset 16459:4ea761ce795b v8.1.1234

patch 8.1.1234: swap file test fails on MS-Windows commit https://github.com/vim/vim/commit/701df4eb64ae9945c63f83621b54aa69e1336a79 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Apr 28 23:07:18 2019 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 28 Apr 2019 23:15:07 +0200
parents ea5ad964e1ba
children 676ccae494ce
files src/testdir/test_swap.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,