diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index 239051e154d61..fda4d03e6b8e7 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 5a2c64cb74e55..e076241607560 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 c816fad8af81e..100c9ea0fbe59 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