Patch 8.1.2352

36 views
Skip to first unread message

Bram Moolenaar

unread,
Nov 27, 2019, 3:59:02 PM11/27/19
to vim...@googlegroups.com

Patch 8.1.2352
Problem: CI doesn't cover FreeBSD.
Solution: Configure Cirrus-CI. (Christian Brabandt, closes #5273)
Files: .cirrus.yml, README.md


*** ../vim-8.1.2351/.cirrus.yml 2019-11-27 21:54:53.006023177 +0100
--- .cirrus.yml 2019-11-27 21:53:11.266504548 +0100
***************
*** 0 ****
--- 1,9 ----
+ freebsd_12_task:
+ freebsd_instance:
+ image: freebsd-12-1-release-amd64
+ install_script:
+ pkg install -y gettext gmake
+ build_script:
+ - gmake
+ test_script:
+ - gmake test
*** ../vim-8.1.2351/README.md 2019-02-17 23:26:47.206170316 +0100
--- README.md 2019-11-27 21:53:11.266504548 +0100
***************
*** 2,12 ****
--- 2,14 ----

[![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
+ [![Build Status](https://api.cirrus-ci.com/github/chrisbra/vim.svg)](https://cirrus-ci.com/github/chrisbra/vim)
[![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
[![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp)
[![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim)
[![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim)
+ For translations of this README see the end.


## What is Vim? ##
***************
*** 29,35 ****
difficult. Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me, Amiga
DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.

-
## Distribution ##

You can often use your favorite package manager to install Vim. On Mac and
--- 31,36 ----
***************
*** 141,143 ****
--- 142,149 ----


This is `README.md` for version 8.1 of Vim: Vi IMproved.
+
+
+ ## Translations of this README ##
+
+ [Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md)
*** ../vim-8.1.2351/src/version.c 2019-11-26 22:38:54.383300529 +0100
--- src/version.c 2019-11-27 21:54:27.946131895 +0100
***************
*** 739,740 ****
--- 739,742 ----
{ /* Add new patch number below this line */
+ /**/
+ 2352,
/**/

--
Why is it called "Windows"? "Gates" would be more appropriate...

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

Christian Brabandt

unread,
Nov 27, 2019, 5:09:08 PM11/27/19
to vim...@googlegroups.com

On Mi, 27 Nov 2019, Bram Moolenaar wrote:

> Patch 8.1.2352
> Problem: CI doesn't cover FreeBSD.
> Solution: Configure Cirrus-CI. (Christian Brabandt, closes #5273)
> Files: .cirrus.yml, README.md

You are too fast ;)

This PR should originally go to my fork so I could test it correctly. I
did not notice that github forwarded the original PR to the upstream
repository, and then I merged by mistake.

> *** ../vim-8.1.2351/.cirrus.yml 2019-11-27 21:54:53.006023177 +0100
> --- .cirrus.yml 2019-11-27 21:53:11.266504548 +0100
> ***************
> *** 0 ****
> --- 1,9 ----
> + freebsd_12_task:
> + freebsd_instance:
> + image: freebsd-12-1-release-amd64
> + install_script:
> + pkg install -y gettext gmake
> + build_script:
> + - gmake
> + test_script:
> + - gmake test
> *** ../vim-8.1.2351/README.md 2019-02-17 23:26:47.206170316 +0100
> --- README.md 2019-11-27 21:53:11.266504548 +0100
> ***************
> *** 2,12 ****
> --- 2,14 ----
>
> [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
> [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
> + [![Build Status](https://api.cirrus-ci.com/github/chrisbra/vim.svg)](https://cirrus-ci.com/github/chrisbra/vim)

Once cirrus CI is enabled for the vim repository using
https://github.com/marketplace/cirrus-ci you can change the badge link from
github/chrisbra/vim to github/vim/vim

and have a correct badge for this CI repo.

Note: My current half-way working patch looks like this:
https://github.com/vim/vim/compare/master...chrisbra:master

Things to note:
- gmake isn't needed, Vim builds fine with make. It's just patch 8.1.2344 causes some problems.
- Vim tests hang at or after test_alot_utf8.vim
- I traced this to `:source!` not correctly working (Vim would hang in
command line mode, waiting for an enter for the `:s` command to complete).
- (I initially tried to add a timer with 15 seconds to runtest.vim, that calls interrupt() so that
every hanging test would eventually quit, but that just made other tests hang, so I commented it out)
- Instead, I reset REDIR_TO_NULL, to be able to see where Vim hangs, then it at least finished, but with
the following failures: https://api.cirrus-ci.com/v1/task/6555324219129856/logs/test.log

Failures:
From test_quickfix.vim:
Found errors in Test_switchbuf():
function RunTheTest[41]..Test_switchbuf line 130: Expected 'split' but got ''
function RunTheTest[41]..Test_switchbuf line 135: Expected 'usetab' but got 'useopen'
function RunTheTest[41]..Test_switchbuf line 140: Expected '' but got 'useopen'
From test_terminal.vim:
Found errors in Test_terminal_composing_unicode():
Run 1:
function RunTheTest[41]..Test_terminal_composing_unicode line 28: Expected 'ä̈�bc' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 30: Expected 'ä̈�' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 31: Expected 'b' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 32: Expected 'c' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 39: Expected 'が��゙��ぎ��ぐ��゙��げ��ご��゙��' but got 'echo が��゙��ぎ��ぐ��゙��げ��ご��゙��'
function RunTheTest[41]..Test_terminal_composing_unicode line 41: Expected 'が��゙��' but got 'e'
function RunTheTest[41]..Test_terminal_composing_unicode line 42: Expected 'ぎ��' but got 'c'
function RunTheTest[41]..Test_terminal_composing_unicode line 43: Expected 'ぐ��゙��' but got 'h'
function RunTheTest[41]..Test_terminal_composing_unicode line 44: Expected 'げ��' but got 'o'
function RunTheTest[41]..Test_terminal_composing_unicode line 45: Expected 'ご��゙��' but got ' '
function RunTheTest[41]..Test_terminal_composing_unicode line 51: Pattern 'echo abc ̈�̈�' does not match 'が��゙��ぎ��ぐ��゙��げ��ご��゙��'
function RunTheTest[41]..Test_terminal_composing_unicode line 52: Expected 'abc ̈�̈�' but got '# echo abc ̈�̈�'
function RunTheTest[41]..Test_terminal_composing_unicode line 54: Expected ' ̈�̈�' but got 'c'
Run 2:
function RunTheTest[41]..Test_terminal_composing_unicode line 28: Expected 'ä̈�bc' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 30: Expected 'ä̈�' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 31: Expected 'b' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 32: Expected 'c' but got ''
function RunTheTest[41]..Test_terminal_composing_unicode line 39: Expected 'が��゙��ぎ��ぐ��゙��げ��ご��゙��' but got 'echo が��゙��ぎ��ぐ��゙��げ��ご��゙��'
function RunTheTest[41]..Test_terminal_composing_unicode line 41: Expected 'が��゙��' but got 'e'
function RunTheTest[41]..Test_terminal_composing_unicode line 42: Expected 'ぎ��' but got 'c'
function RunTheTest[41]..Test_terminal_composing_unicode line 43: Expected 'ぐ��゙��' but got 'h'
function RunTheTest[41]..Test_terminal_composing_unicode line 44: Expected 'げ��' but got 'o'
function RunTheTest[41]..Test_terminal_composing_unicode line 45: Expected 'ご��゙��' but got ' '
function RunTheTest[41]..Test_terminal_composing_unicode line 51: Pattern 'echo abc ̈�̈�' does not match 'が��゙��ぎ��ぐ��゙��げ��ご��゙��'
function RunTheTest[41]..Test_terminal_composing_unicode line 52: Expected 'abc ̈�̈�' but got '# echo abc ̈�̈�'
function RunTheTest[41]..Test_terminal_composing_unicode line 54: Expected ' ̈�̈�' but got 'c'
Flaky test failed too often, giving up
From test_alot_utf8.vim:
Found errors in Test_gap():
function RunTheTest[41]..Test_gap line 3: Expected ['ABCD', '', 'defg'] but got ['ABCDDEFG']
Found errors in Test_source_ctrl_v():
function RunTheTest[41]..Test_source_ctrl_v line 16: Expected ['sd', 'map __2 asd\esecondsd\esd0map __5 asd0fifth'] but got ['sdmap __2 asd\esecondsd\esd0map __5 asd0fifth']

Now its too late, need some sleep. Will have a look later this week.

Best,
Christian
--
Lieber eine Fliege im Porzellan-Laden als ein Elefant in der Suppe.

Ken Takata

unread,
Nov 27, 2019, 9:13:39 PM11/27/19
to vim_dev
Hi Christian,


2019/11/28 Thu 7:09:08 UTC+9 Christian Brabandt wrote:

On Mi, 27 Nov 2019, Bram Moolenaar wrote:

> Patch 8.1.2352
> Problem:    CI doesn't cover FreeBSD.
> Solution:   Configure Cirrus-CI. (Christian Brabandt, closes #5273)
> Files:            .cirrus.yml, README.md

You are too fast ;)

This patch is not appeared in mercurial mirrors.

Regards,
Ken Takata

Christian Brabandt

unread,
Nov 28, 2019, 1:33:49 AM11/28/19
to vim_dev

On Mi, 27 Nov 2019, Ken Takata wrote:

> This patch is not appeared in mercurial mirrors.

Thanks, the merges did confuse my script. Mirrors are updated.


Best,
Christian
--
Warum überquerte das Huhn die Straße?
Richard M. Nixon:
Das Huhn hat die Straße nicht überquert. Ich wiederhole, das Huhn
hat die Straße NICHT überquert.

Bram Moolenaar

unread,
Nov 28, 2019, 2:53:38 PM11/28/19
to vim...@googlegroups.com, Christian Brabandt

Christian wrote:

> On Mi, 27 Nov 2019, Bram Moolenaar wrote:
>
> > Patch 8.1.2352
> > Problem: CI doesn't cover FreeBSD.
> > Solution: Configure Cirrus-CI. (Christian Brabandt, closes #5273)
> > Files: .cirrus.yml, README.md
>
> You are too fast ;)

I'll pull the handbrake.

> This PR should originally go to my fork so I could test it correctly. I
> did not notice that github forwarded the original PR to the upstream
> repository, and then I merged by mistake.

Yeah, that got mixed up with another change I was trying to push. The
github support for rolling back a commit resulted in three changes...
Oh, well, should have the right version now, only the commit history
looks a bit strange.
Done that.

> Note: My current half-way working patch looks like this:
> https://github.com/vim/vim/compare/master...chrisbra:master
>
> Things to note:
> - gmake isn't needed, Vim builds fine with make. It's just patch 8.1.2344 causes some problems.

I'll merge the changes from your .cirrus.yml.

> - Vim tests hang at or after test_alot_utf8.vim
> - I traced this to `:source!` not correctly working (Vim would hang in
> command line mode, waiting for an enter for the `:s` command to complete).
> - (I initially tried to add a timer with 15 seconds to runtest.vim, that calls interrupt() so that
> every hanging test would eventually quit, but that just made other tests hang, so I commented it out)
> - Instead, I reset REDIR_TO_NULL, to be able to see where Vim hangs, then it at least finished, but with
> the following failures: https://api.cirrus-ci.com/v1/task/6555324219129856/logs/test.log
> Failures:

Well have to find out how to fix them. Let me at least update the link
and yml file to the latest, even though it doesn't work yet.

> Now its too late, need some sleep. Will have a look later this week.

OK, let me know when something works. Although the build on your repo
appears to be green now.

--
There are three kinds of persons: Those who can count and those who can't.

Christian Brabandt

unread,
Nov 29, 2019, 4:05:33 AM11/29/19
to vim...@googlegroups.com

On Do, 28 Nov 2019, Bram Moolenaar wrote:

> > You are too fast ;)
>
> I'll pull the handbrake.

We need a big red button ;)

> > and have a correct badge for this CI repo.
>
> Done that.

Great.

> OK, let me know when something works. Although the build on your repo
> appears to be green now.

Isn't it great what a couple of `|| true` can do ;) ?

I think I have fixed a couple of failing tests and added a few more
skips for which it was not obviously clear to me what causes the
failure. See https://github.com/vim/vim/pull/5281

Best,
Christian
--
Ich verwünsche die, die aus dem Irrtum eine eigene Welt machen
und doch unablässig fordern, dass der Mensch nützlich sein müsse.
-- Goethe, Maximen und Reflektionen, Nr. 263
Reply all
Reply to author
Forward
0 new messages