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 #6015)

diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 239051e154d6137c569c2bd5177bfb4b29364b0e..fda4d03e6b8e77fb5484410683227f4f4f0dc58d 100644 (file)
--- 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 5a2c64cb74e551b1a13cdcccfc06332443c2d230..e076241607560c8272643e40021d7f31930c2a82 100644 (file)
--- 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 c816fad8af81e0e013ea945c45182332d00fbeef..100c9ea0fbe597b31315b254dfe8e00dd0444997 100644 (file)
--- 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 a04f4b3f313543d3696b619bfbed3bede863eba0..7a563d145b0512dd996cd484e196b43349c53de1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    666,
 /**/
     665,
 /**/