Fix test failures caused by Archive-Extract upgrade

p4raw-id: //depot/perl@35106
rurban · Dec 15, 2008 · 29c6b33 · 29c6b33
1 parent 8328529
commit 29c6b33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Archive/Extract.pm b/lib/Archive/Extract.pm
@@ -38,7 +38,7 @@ use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG
             $_ALLOW_BIN $_ALLOW_PURE_PERL
          ];
 
-$VERSION            = '0.28';
+$VERSION            = '0.28_01';
 $PREFER_BIN         = 0;
 $WARN               = 1;
 $DEBUG              = 0;

diff --git a/lib/Archive/Extract/t/01_Archive-Extract.t b/lib/Archive/Extract/t/01_Archive-Extract.t
@@ -350,7 +350,9 @@ for my $switch ( [0,1], [1,0] ) {
                         : ($OutDir);
 
         skip "No binaries or modules to extract ".$archive, 
-            (10 * scalar @outs) if $mod_fail && $pgm_fail;
+            (10 * scalar @outs) if
+            	($mod_fail && ($pgm_fail || !$Archive::Extract::_ALLOW_BIN)) ||
+		($pgm_fail && ($mod_fail || !$Archive::Extract::_ALLOW_PURE_PERL));
 
         ### we dont warnings spewed about missing modules, that might
         ### be a problem...