usa	2016-11-15 03:54:47 +0900 (Tue, 15 Nov 2016)

  New Revision: 56788

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56788

  Log:
    merge revision(s) 56625: [Backport #12936]
    
    * test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
      test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast 
      address is not available.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/rinda/test_rinda.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 56787)
+++ ruby_2_2/ChangeLog	(revision 56788)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Nov 15 03:54:14 2016  Shugo Maeda  <shugo@r...>
+
+	* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
+	  test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast 
+	  address is not available.
+
 Tue Nov 15 03:39:07 2016  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/http.rb (transport_request): other than HTTPContinue
Index: ruby_2_2/test/rinda/test_rinda.rb
===================================================================
--- ruby_2_2/test/rinda/test_rinda.rb	(revision 56787)
+++ ruby_2_2/test/rinda/test_rinda.rb	(revision 56788)
@@ -793,6 +793,8 @@ class TestRingFinger < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rinda/test_rinda.rb#L793
     rescue Errno::EINVAL
       # somehow Debian 6.0.7 needs ifname
       v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
+    rescue Errno::EADDRNOTAVAIL
+      return # IPv6 address for multicast not available
     end
 
     assert_equal(1, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP).int)
@@ -817,6 +819,8 @@ class TestRingFinger < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rinda/test_rinda.rb#L819
     rescue Errno::EINVAL
       # somehow Debian 6.0.7 needs ifname
       v6mc = @rf.make_socket("ff02::1%#{ifaddr.name}")
+    rescue Errno::EADDRNOTAVAIL
+      return # IPv6 address for multicast not available
     end
     assert_equal(2, v6mc.getsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS).int)
   ensure
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56787)
+++ ruby_2_2/version.h	(revision 56788)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-11-15"
-#define RUBY_PATCHLEVEL 393
+#define RUBY_PATCHLEVEL 394
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56625


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/