diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/zlib/test_zlib.rb | 10 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Mar 25 17:35:06 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * 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. + Fri Mar 25 17:33:52 2016 Rei Odaira <Rei.Odaira@gmail.com> * test/socket/test_addrinfo.rb (test_ipv6_address_predicates): 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-03-25" -#define RUBY_PATCHLEVEL 464 +#define RUBY_PATCHLEVEL 465 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |