From: Sean Dewar <6256228+seandewar@users.noreply.github.com> Date: Thu, 28 Mar 2024 08:48:34 +0000 (+0100) Subject: patch 9.1.0213: CI: MS-Windows fails in test_winfixbuf X-Git-Tag: v9.1.0213^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aed6554b46bbba39bcb22e49cc731176cd75789b;p=thirdparty%2Fvim.git patch 9.1.0213: CI: MS-Windows fails in test_winfixbuf Problem: CI: MS-Windows fails in test_winfixbuf (after v9.1.208) Solution: Instead of skipping the test, write the file so it exists on disk, to verify that MS-Windows short filename expansion is successful. (Sean Dewar) related: #14286 Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com> Signed-off-by: Christian Brabandt --- diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim index 462554b112..610e8e0bc7 100644 --- a/src/testdir/test_winfixbuf.vim +++ b/src/testdir/test_winfixbuf.vim @@ -1251,11 +1251,12 @@ endfunc " Allow :e selecting the current buffer as a full path func Test_edit_same_buffer_on_disk_absolute_path() - " This fails on CI (Windows builds), why? - CheckNotMSWindows call s:reset_all_buffers() let file = tempname() + " file must exist for expansion of 8.3 paths to succeed + call writefile([], file, 'D') + let file = fnamemodify(file, ':p') let current = bufnr() execute "edit " . file write! @@ -1265,7 +1266,6 @@ func Test_edit_same_buffer_on_disk_absolute_path() execute "edit " file call assert_equal(current, bufnr()) - call delete(file) set nowinfixbuf endfunc diff --git a/src/version.c b/src/version.c index 1ea07b334b..5383d51514 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 213, /**/ 212, /**/