changeset 34656:3b29a2cdbf74 v9.1.0212

patch 9.1.0212: CI: MS-Windows fails in test_winfixbuf Commit: https://github.com/vim/vim/commit/79b2867ce3f4ed99d8c4e06c2c3b8f105f67c53a Author: Christian Brabandt <cb@256bit.org> Date: Wed Mar 27 10:44:14 2024 +0100 patch 9.1.0212: CI: MS-Windows fails in test_winfixbuf Problem: CI: MS-Windows fails in test_winfixbuf (after v9.1.208) Solution: Skip Ms-Windows for now, fix style related: #14286 Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Wed, 27 Mar 2024 11:00:06 +0100
parents a63ac82f6e7f
children 75a8299ca1ea
files src/testdir/test_winfixbuf.vim src/version.c
diffstat 2 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_winfixbuf.vim
+++ b/src/testdir/test_winfixbuf.vim
@@ -1239,30 +1239,34 @@ endfunc
 func Test_edit_same_buffer_in_memory()
   call s:reset_all_buffers()
 
-  let l:current = bufnr()
+  let current = bufnr()
   file same_buffer
 
-  call assert_equal(l:current, bufnr())
+  call assert_equal(current, bufnr())
   set winfixbuf
   edit same_buffer
-  call assert_equal(l:current, bufnr())
+  call assert_equal(current, bufnr())
+  set nowinfixbuf
 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 l:file = tempname()
-  let l:current = bufnr()
-  execute "edit " . l:file
+  let file = tempname()
+  let current = bufnr()
+  execute "edit " . file
   write!
 
-  call assert_equal(l:current, bufnr())
+  call assert_equal(current, bufnr())
   set winfixbuf
-  execute "edit " l:file
-  call assert_equal(l:current, bufnr())
-
-  call delete(l:file)
+  execute "edit " file
+  call assert_equal(current, bufnr())
+
+  call delete(file)
+  set nowinfixbuf
 endfunc
 
 " Fail :enew but :enew! is allowed
--- 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 */
 /**/
+    212,
+/**/
     211,
 /**/
     210,