aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/zlib/test_zlib.rb10
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6dcc17d637..6729e9a397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 5 07:14:10 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.
+
Sat Mar 5 03:07:40 2016 Rei Odaira <Rei.Odaira@gmail.com>
* thread_pthread.c (getstack): __pi_stacksize returned by
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index 37d4b69b0a..0092daf0d9 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -1070,6 +1070,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
@@ -1087,6 +1092,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