diff options
author | Steve Hay <SteveHay@planit.com> | 2008-12-15 15:39:12 +0000 |
---|---|---|
committer | Steve Hay <SteveHay@planit.com> | 2008-12-15 15:39:12 +0000 |
commit | 9324b543aa851c78275f74394983a53fdfd1a396 (patch) | |
tree | 9cd6597a45e331e774f4241af38b546bd6087e3c | |
parent | c6ae3e1d933950ce440c7eb891f1831b6e7d41ad (diff) | |
download | perl-9324b543aa851c78275f74394983a53fdfd1a396.tar.gz |
Fix test failures caused by Archive-Extract upgrade
p4raw-id: //depot/perl@35106
-rw-r--r-- | lib/Archive/Extract.pm | 2 | ||||
-rw-r--r-- | lib/Archive/Extract/t/01_Archive-Extract.t | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Archive/Extract.pm b/lib/Archive/Extract.pm index c7486bd100..e1f8a11547 100644 --- 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 index 5aa941cf03..3d414604ec 100644 --- 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... |