# HG changeset patch # User Bram Moolenaar # Date 1588267804 -7200 # Node ID ec0ace1ddc206c487dc08946e11e1c84c1a2c8e1 # Parent c9f956dfe3a011b926b881a9d85a00eff177b3c3 patch 8.2.0666: Ruby test fails on MS-Windows Commit: https://github.com/vim/vim/commit/88e6cc253903c86d06abb59b35c85e6aef0152f3 Author: Bram Moolenaar Date: Thu Apr 30 19:19:29 2020 +0200 patch 8.2.0666: Ruby test fails on MS-Windows Problem: Ruby test fails on MS-Windows. Solution: Remove the "maintainer" line. (Ken Takata, closes https://github.com/vim/vim/issues/6015) diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -338,4 +338,16 @@ func IsRoot() return v:false endfunc +" Get all messages but drop the maintainer entry. +func GetMessages() + redir => result + redraw | messages + redir END + let msg_list = split(result, "\n") + if msg_list->len() > 0 && msg_list[0] =~ 'Messages maintainer:' + return msg_list[1:] + endif + return msg_list +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim --- a/src/testdir/test_messages.vim +++ b/src/testdir/test_messages.vim @@ -3,18 +3,6 @@ source shared.vim source term_util.vim -" Get all messages but drop the maintainer entry. -func GetMessages() - redir => result - redraw | messages - redir END - let msg_list = split(result, "\n") - if msg_list->len() > 0 && msg_list[0] =~ 'Messages maintainer:' - return msg_list[1:] - endif - return msg_list -endfunc - func Test_messages() let oldmore = &more try diff --git a/src/testdir/test_ruby.vim b/src/testdir/test_ruby.vim --- a/src/testdir/test_ruby.vim +++ b/src/testdir/test_ruby.vim @@ -378,7 +378,7 @@ endfunc func Test_ruby_p() ruby p 'Just a test' - let messages = split(execute('message'), "\n") + let messages = GetMessages() call assert_equal('"Just a test"', messages[-1]) " Check return values of p method @@ -391,7 +391,7 @@ func Test_ruby_p() messages clear call assert_equal(v:true, rubyeval('p() == nil')) - let messages = split(execute('message'), "\n") + let messages = GetMessages() call assert_equal(0, len(messages)) endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 666, +/**/ 665, /**/ 664,