streamzip: tighten up version tests for failing windows tests

#41
pmqs · Apr 24, 2022 · 3497645 · 3497645
1 parent 0ac0d1e
commit 3497645
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/lib/IO/Compress/Zip.pm b/lib/IO/Compress/Zip.pm
@@ -85,20 +85,24 @@ sub isMethodAvailable
         if $method == ZIP_CM_STORE || $method == ZIP_CM_DEFLATE ;
 
     return 1
-        if $method == ZIP_CM_BZIP2 and
-           defined $IO::Compress::Adapter::Bzip2::VERSION;
+        if $method == ZIP_CM_BZIP2 &&
+           defined $IO::Compress::Adapter::Bzip2::VERSION &&
+           defined &{ "IO::Compress::Adapter::Bzip2::mkRawZipCompObject" };
 
     return 1
-        if $method == ZIP_CM_LZMA and
-           defined $IO::Compress::Adapter::Lzma::VERSION;
+        if $method == ZIP_CM_LZMA &&
+           defined $IO::Compress::Adapter::Lzma::VERSION &&
+           defined &{ "IO::Compress::Adapter::Lzma::mkRawZipCompObject" };
 
     return 1
-        if $method == ZIP_CM_XZ and
-           defined $IO::Compress::Adapter::Xz::VERSION;
+        if $method == ZIP_CM_XZ &&
+           defined $IO::Compress::Adapter::Xz::VERSION &&
+           defined &{ "IO::Compress::Adapter::Xz::mkRawZipCompObject" };
 
     return 1
-        if $method == ZIP_CM_ZSTD and
-           defined $IO::Compress::Adapter::ZSTD::VERSION;
+        if $method == ZIP_CM_ZSTD &&
+           defined $IO::Compress::Adapter::ZSTD::VERSION &&
+           defined &{ "IO::Compress::Adapter::ZSTD::mkRawZipCompObject" };
 
     return 0;
 }

diff --git a/t/011-streamzip.t b/t/011-streamzip.t
@@ -87,7 +87,7 @@ sub check
 
 
 # streamzip
-# ########
+# #########
 
 {
     title "streamzip" ;
@@ -123,22 +123,25 @@ for my $method (qw(store deflate bzip2 lzma xz zstd))
     {
         if ($method eq 'lzma')
         {
-            eval { require IO::Compress::Lzma } ;
+            no warnings;
+            eval { require IO::Compress::Lzma && defined &{ 'IO::Compress::Adapter::Bzip2::mkRawZipCompObject' } } ;
             skip "Method 'lzma' needs IO::Compress::Lzma\n", 8
                 if $@;
         }
 
         if ($method eq 'zstd')
         {
-            eval { require IO::Compress::Zstd } ;
+            no warnings;
+            eval { require IO::Compress::Zstd && defined &{ 'IO::Compress::Adapter::Zstd::mkRawZipCompObject' }} ;
             skip "Method 'zstd' needs IO::Compress::Zstd\n", 8
                 if $@;
         }
 
         if ($method eq 'xz')
         {
-            eval { require IO::Compress::Xz } ;
-            skip "Method 'zstd' needs IO::Compress::Xz\n", 8
+            no warnings;
+            eval { require IO::Compress::Xz && defined &{ 'IO::Compress::Adapter::Xz::mkRawZipCompObject' }} ;
+            skip "Method 'xz' needs IO::Compress::Xz\n", 8
                 if $@;
         }