diff options
| author | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-03-28 09:48:34 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-28 09:48:34 +0100 |
| commit | aed6554b46bbba39bcb22e49cc731176cd75789b (patch) | |
| tree | cf4678020b3a9ea45ff4af84773370d66c76b041 | |
| parent | 79b2867ce3f4ed99d8c4e06c2c3b8f105f67c53a (diff) | |
patch 9.1.0213: CI: MS-Windows fails in test_winfixbufv9.1.0213
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 <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_winfixbuf.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
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 @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 213, +/**/ 212, /**/ 211, |