1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
diff --git a/cpan/Compress-Raw-Zlib/t/02zlib.t b/cpan/Compress-Raw-Zlib/t/02zlib.t
index 64c8944..9b2e9cb 100644
--- a/cpan/Compress-Raw-Zlib/t/02zlib.t
+++ b/cpan/Compress-Raw-Zlib/t/02zlib.t
@@ -13,6 +13,7 @@ use bytes;
use Test::More ;
use CompTestUtils;
+use constant ZLIB_1_2_12_0 => 0x12C0;
BEGIN
{
@@ -490,7 +491,16 @@ SKIP:
last if $status == Z_STREAM_END or $status != Z_OK ;
}
- cmp_ok $status, '==', Z_DATA_ERROR ;
+ # Z_STREAM_END returned by 1.12.2, Z_DATA_ERROR for older zlib
+ if (ZLIB_VERNUM >= ZLIB_1_2_12_0)
+ {
+ cmp_ok $status, '==', Z_STREAM_END ;
+ }
+ else
+ {
+ cmp_ok $status, '==', Z_DATA_ERROR ;
+ }
+
is $GOT, $goodbye ;
@@ -514,7 +524,17 @@ SKIP:
is length($rest), $len2, "expected compressed output";
$GOT = '';
- cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR, "inflate returns Z_DATA_ERROR";
+ $status = $k->inflate($rest, $GOT);
+ # Z_STREAM_END returned by 1.12.2, Z_DATA_ERROR for older zlib
+ if (ZLIB_VERNUM >= ZLIB_1_2_12_0)
+ {
+ cmp_ok $status, '==', Z_STREAM_END ;
+ }
+ else
+ {
+ cmp_ok $status, '==', Z_DATA_ERROR ;
+ }
+
is $GOT, $goodbye ;
}
diff --git a/cpan/IO-Compress/t/cz-03zlib-v1.t b/cpan/IO-Compress/t/cz-03zlib-v1.t
index 9b75f9b..41734d0 100644
--- a/cpan/IO-Compress/t/cz-03zlib-v1.t
+++ b/cpan/IO-Compress/t/cz-03zlib-v1.t
@@ -14,6 +14,8 @@ use Test::More ;
use CompTestUtils;
use Symbol;
+use constant ZLIB_1_2_12_0 => 0x12C0;
+
BEGIN
{
# use Test::NoWarnings, if available
@@ -700,7 +702,16 @@ EOM
($GOT, $status) = $k->inflate($rest) ;
- ok $status == Z_DATA_ERROR ;
+ # Z_STREAM_END returned by 1.12.2, Z_DATA_ERROR for older zlib
+ if (ZLIB_VERNUM >= ZLIB_1_2_12_0)
+ {
+ cmp_ok $status, '==', Z_STREAM_END ;
+ }
+ else
+ {
+ cmp_ok $status, '==', Z_DATA_ERROR ;
+ }
+
ok $Z . $GOT eq $goodbye ;
}
|
