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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 0 deletions

diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index bb76c23a1f..a0a557fa13 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -1046,6 +1046,11 @@ if defined? Zlib
         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
 
@@ -1063,6 +1068,11 @@ if defined? Zlib
         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