nagachika	2016-03-29 02:03:02 +0900 (Tue, 29 Mar 2016)

  New Revision: 54338

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

  Log:
    merge revision(s) 54003: [Backport #12153]
    
    * test/-ext-/float/test_nextafter.rb: In AIX,
      nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0,
      but they should return -0.0 and +0.0, respectively. This is
      a known bug in nextafter(3) on AIX, so skip related tests.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/-ext-/float/test_nextafter.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54337)
+++ ruby_2_2/version.h	(revision 54338)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 280
+#define RUBY_PATCHLEVEL 281
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/test/-ext-/float/test_nextafter.rb
===================================================================
--- ruby_2_2/test/-ext-/float/test_nextafter.rb	(revision 54337)
+++ ruby_2_2/test/-ext-/float/test_nextafter.rb	(revision 54338)
@@ -45,9 +45,16 @@ class TestFloatExt < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/-ext-/float/test_nextafter.rb#L45
           if v1 == 0
             s1 = 1.0/v1 < 0 ? "negative-zero" : "positive-zero"
             s2 = 1.0/v2 < 0 ? "negative-zero" : "positive-zero"
-            assert_equal(s1, s2,
-            "Bug::Float.missing_nextafter(#{'%a' % n1}, #{'%a' % n2}) = #{'%a' % v1} != " +
-            "#{'%a' % v2} = Bug::Float.system_nextafter(#{'%a' % n1}, #{'%a' % n2})")
+            begin
+              assert_equal(s1, s2,
+              "Bug::Float.missing_nextafter(#{'%a' % n1}, #{'%a' % n2}) = #{'%a' % v1} != " +
+              "#{'%a' % v2} = Bug::Float.system_nextafter(#{'%a' % n1}, #{'%a' % n2})")
+            rescue Minitest::Assertion
+              if /aix/ =~ RUBY_PLATFORM
+                skip "Known bug in nextafter(3) on AIX"
+              end
+              raise $!
+            end
           end
         end
       }
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54337)
+++ ruby_2_2/ChangeLog	(revision 54338)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 02:02:53 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* test/-ext-/float/test_nextafter.rb: In AIX,
+	  nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0,
+	  but they should return -0.0 and +0.0, respectively. This is
+	  a known bug in nextafter(3) on AIX, so skip related tests.
+
 Tue Mar 29 01:56:24 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rubygems/installer.rb: merge partially r49511.

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


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