nagachika	2016-03-29 00:43:53 +0900 (Tue, 29 Mar 2016)

  New Revision: 54325

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

  Log:
    merge revision(s) 54002: [Backport #12151]
    
    * test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
      Skip two tests on AIX because zconf.h in zlib does not correctly
      recognize _LARGE_FILES in AIX. The problem was already reported
      to zlib, and skip these tests until it is fixed.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/zlib/test_zlib.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/test/zlib/test_zlib.rb
===================================================================
--- ruby_2_2/test/zlib/test_zlib.rb	(revision 54324)
+++ ruby_2_2/test/zlib/test_zlib.rb	(revision 54325)
@@ -1044,6 +1044,11 @@ if defined? Zlib https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/zlib/test_zlib.rb#L1044
         assert_equal(0x02820145, Zlib.adler32_combine(one, two, 1))
       rescue NotImplementedError
         skip "adler32_combine is not implemented"
+      rescue Minitest::Assertion
+        if /aix/ =~ RUBY_PLATFORM
+          skip "zconf.h in zlib does not handle _LARGE_FILES in AIX. Skip until it is fixed"
+        end
+        raise $!
       end
     end
 
@@ -1061,6 +1066,11 @@ if defined? Zlib https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/zlib/test_zlib.rb#L1066
         assert_equal(0x8c736521, Zlib.crc32_combine(one, two, 1))
       rescue NotImplementedError
         skip "crc32_combine is not implemented"
+      rescue Minitest::Assertion
+        if /aix/ =~ RUBY_PLATFORM
+          skip "zconf.h in zlib does not handle _LARGE_FILES in AIX. Skip until it is fixed"
+        end
+        raise $!
       end
     end
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54324)
+++ ruby_2_2/version.h	(revision 54325)
@@ -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 267
+#define RUBY_PATCHLEVEL 268
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54324)
+++ ruby_2_2/ChangeLog	(revision 54325)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 00:43:40 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
+	  Skip two tests on AIX because zconf.h in zlib does not correctly
+	  recognize _LARGE_FILES in AIX. The problem was already reported
+	  to zlib, and skip these tests until it is fixed.
+
 Tue Mar 29 00:42:10 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip

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


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