changeset 11963:f1635be0e963 v8.0.0862

patch 8.0.0862: file size test fails on MS-Windows commit https://github.com/vim/vim/commit/07c043af5f054c7dfeb676414f8fa6aeda8f9c2b Author: Bram Moolenaar <Bram@vim.org> Date: Fri Aug 4 22:56:39 2017 +0200 patch 8.0.0862: file size test fails on MS-Windows Problem: File size test fails on MS-Windows. Solution: Set fileformat after opening new buffer. Strip CR.
author Christian Brabandt <cb@256bit.org>
date Fri, 04 Aug 2017 23:00:05 +0200
parents 4516c3f0715d
children 045453b06831
files src/testdir/test_file_size.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_file_size.vim
+++ b/src/testdir/test_file_size.vim
@@ -11,17 +11,18 @@ func Test_File_Size()
   if !executable('cksum')
       return
   endif
-  set belloff=all fileformat=unix undolevels=-1
 
   new
+  set belloff=all fileformat=unix undolevels=-1
   for i in range(1, 2000000, 100)
       call append(i, range(i, i + 99))
   endfor
 
   1delete
   w! Xtest
-  let l = systemlist('cksum Xtest')
-  call assert_equal('3678979763 14888896 Xtest', l[0])
+  let res = systemlist('cksum Xtest')[0]
+  let res = substitute(res, "\r", "", "")
+  call assert_equal('3678979763 14888896 Xtest', res)
 
   enew!
   call delete('Xtest')
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    862,
+/**/
     861,
 /**/
     860,