diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-04 22:56:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-04 22:56:39 +0200 |
| commit | 07c043af5f054c7dfeb676414f8fa6aeda8f9c2b (patch) | |
| tree | f42adafa3662b3103066e38fa14497ce62e76675 | |
| parent | 4a137b45864310060410f34cb9c7d0f0231bb256 (diff) | |
| download | vim-git-07c043af5f054c7dfeb676414f8fa6aeda8f9c2b.tar.gz | |
patch 8.0.0862: file size test fails on MS-Windowsv8.0.0862
Problem: File size test fails on MS-Windows.
Solution: Set fileformat after opening new buffer. Strip CR.
| -rw-r--r-- | src/testdir/test_file_size.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_file_size.vim b/src/testdir/test_file_size.vim index f9d453ba8..624d49359 100644 --- 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') diff --git a/src/version.c b/src/version.c index 5a77e0ab9..c15a6b33f 100644 --- 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, |