diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-30 19:19:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-30 19:19:29 +0200 |
| commit | 88e6cc253903c86d06abb59b35c85e6aef0152f3 (patch) | |
| tree | 5722c4f7f02a6bab7c2d853b923e8b3b7fa44e2f | |
| parent | a161cb5dddd6d374899e46fde834ce9ba5c80c0b (diff) | |
patch 8.2.0666: Ruby test fails on MS-Windowsv8.2.0666
Problem: Ruby test fails on MS-Windows.
Solution: Remove the "maintainer" line. (Ken Takata, closes #6015)
| -rw-r--r-- | src/testdir/shared.vim | 12 | ||||
| -rw-r--r-- | src/testdir/test_messages.vim | 12 | ||||
| -rw-r--r-- | src/testdir/test_ruby.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 16 insertions, 14 deletions
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index 239051e154..fda4d03e6b 100644 --- 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 index 5a2c64cb74..e076241607 100644 --- 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 index c816fad8af..100c9ea0fb 100644 --- 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 index a04f4b3f31..7a563d145b 100644 --- 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, |