Mercurial > vim
changeset 20221:ec0ace1ddc20 v8.2.0666
patch 8.2.0666: Ruby test fails on MS-Windows
Commit: https://github.com/vim/vim/commit/88e6cc253903c86d06abb59b35c85e6aef0152f3
Author: Bram Moolenaar <Bram@vim.org>
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 30 Apr 2020 19:30:04 +0200 |
parents | c9f956dfe3a0 |
children | fece96aeff70 |
files | src/testdir/shared.vim src/testdir/test_messages.vim src/testdir/test_ruby.vim src/version.c |
diffstat | 4 files changed, 16 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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