diff options
Diffstat (limited to 'cpan/IO-Compress')
34 files changed, 78 insertions, 66 deletions
diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes index 6460a72849..ef306447b6 100644 --- a/cpan/IO-Compress/Changes +++ b/cpan/IO-Compress/Changes @@ -1,8 +1,12 @@ CHANGES ------- - 2.021 30 August 2009 + 2.022 9 October 2009 + + * IO::Compress - Makefile.PL + Fix for core. + 2.021 30 August 2009 * IO::Compress::Base.pm - Less warnnings when reading from a closed filehandle. diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL index 64cdd29dac..018e27bdc8 100644 --- a/cpan/IO-Compress/Makefile.PL +++ b/cpan/IO-Compress/Makefile.PL @@ -42,8 +42,8 @@ WriteMakefile( INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'), ( - $] >= 5.009 && ! $ENV{PERL_CORE} - ? (INST_LIB => 'blib/arch') + $] >= 5.009 && $] <= 5.011001 && ! $ENV{PERL_CORE} + ? (INSTALLPRIVLIB => '$(INSTALLARCHLIB)') : () ), diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README index 67cc0c6ed4..8da9fbfbaa 100644 --- a/cpan/IO-Compress/README +++ b/cpan/IO-Compress/README @@ -1,9 +1,9 @@ - IO-Compress + IO-Compress - Version 2.021 + Version 2.022 - 30th August 2009 + 9th October 2009 Copyright (c) 1995-2009 Paul Marquess. All rights reserved. This program is free software; you can redistribute it diff --git a/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm index 0a611039b8..604227c3a1 100644 --- a/cpan/IO-Compress/lib/Compress/Zlib.pm +++ b/cpan/IO-Compress/lib/Compress/Zlib.pm @@ -18,7 +18,7 @@ use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.021'; +$VERSION = '2.022'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm index a56331d2cb..103a0452b6 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm @@ -10,7 +10,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status); use Compress::Raw::Bzip2 2.021 ; our ($VERSION); -$VERSION = '2.021'; +$VERSION = '2.022'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm index 525868093c..ac8f0364f9 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm @@ -9,7 +9,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status); use Compress::Raw::Zlib 2.021 qw(Z_OK Z_FINISH MAX_WBITS) ; our ($VERSION); -$VERSION = '2.021'; +$VERSION = '2.022'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm index c980e6c343..e83542fca7 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm @@ -7,7 +7,7 @@ use bytes; use IO::Compress::Base::Common 2.021 qw(:Status); our ($VERSION); -$VERSION = '2.021'; +$VERSION = '2.022'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index 7b558eafeb..bdd8d79513 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Base.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Base.pm @@ -20,7 +20,7 @@ use bytes; our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.021'; +$VERSION = '2.022'; #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16. diff --git a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm index 7981585d49..26af4f87b0 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm @@ -11,7 +11,7 @@ use File::GlobMapper; require Exporter; our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE); @ISA = qw(Exporter); -$VERSION = '2.021'; +$VERSION = '2.022'; @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput isaFileGlobString cleanFileGlobString oneTarget @@ -589,7 +589,7 @@ sub IO::Compress::Base::Parameters::parse $key = lc $key; if ($firstTime || ! $sticky) { - $x = [ $x ] + $x = [] if $type & Parse_multiple; $got->{$key} = [0, $type, $value, $x, $first_only, $sticky] ; diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm index e5f86b2f36..28725c64a8 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm @@ -14,7 +14,7 @@ use IO::Compress::Adapter::Bzip2 2.021 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.021'; +$VERSION = '2.022'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm index 7ee0a53997..2e1a19fe07 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm @@ -15,7 +15,7 @@ use IO::Compress::Base::Common 2.021 qw(createSelfTiedObject); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError); -$VERSION = '2.021'; +$VERSION = '2.022'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm index 5ddfad20b9..f2e60f6557 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm @@ -27,7 +27,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError); -$VERSION = '2.021'; +$VERSION = '2.022'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm index 826183680e..095668e4fb 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names); our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE); -$VERSION = '2.021'; +$VERSION = '2.022'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm index ad642dbfa5..02a8cda27a 100644 --- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm @@ -16,7 +16,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.021'; +$VERSION = '2.022'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm index 563b10d9bf..d6e6167b95 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm @@ -32,7 +32,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError); -$VERSION = '2.021'; +$VERSION = '2.022'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm index d16eb238ef..a554d49df6 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm @@ -7,7 +7,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.021'; +$VERSION = '2.022'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm index d65fedc580..6b935ffc11 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.021'; +$VERSION = '2.022'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm index 72b4ddd370..0c88017a63 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm @@ -8,7 +8,7 @@ use bytes; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.021'; +$VERSION = '2.022'; use IO::Compress::Gzip::Constants 2.021 ; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm index b2053aff10..796aadb416 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm @@ -9,7 +9,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status); use Compress::Raw::Bzip2 2.021 ; our ($VERSION, @ISA); -$VERSION = '2.021'; +$VERSION = '2.022'; sub mkUncompObject { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm index 0df174320a..834eb5d230 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm @@ -8,7 +8,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status); our ($VERSION); -$VERSION = '2.021'; +$VERSION = '2.022'; use Compress::Raw::Zlib 2.021 (); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm index d03148c0b4..5c67c1b6a8 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm @@ -8,7 +8,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status); use Compress::Raw::Zlib 2.021 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.021'; +$VERSION = '2.022'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index e8ffc5c15b..900feda477 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm @@ -21,7 +21,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.021'; +$VERSION = '2.022'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index cc1ba24b47..c4406e55d5 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm @@ -13,7 +13,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.021'; +$VERSION = '2.022'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -31,8 +31,8 @@ BEGIN eval ' use IO::Uncompress::Adapter::Bunzip2 2.021 ;'; eval ' use IO::Uncompress::Adapter::LZO 2.021 ;'; eval ' use IO::Uncompress::Adapter::Lzf 2.021 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;'; + #eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;'; + #eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;'; eval ' use IO::Uncompress::Bunzip2 2.021 ;'; eval ' use IO::Uncompress::UnLzop 2.021 ;'; @@ -41,8 +41,8 @@ BEGIN eval ' use IO::Uncompress::RawInflate 2.021 ;'; eval ' use IO::Uncompress::Unzip 2.021 ;'; eval ' use IO::Uncompress::UnLzf 2.021 ;'; - eval ' use IO::Uncompress::UnLzma 2.018 ;'; - eval ' use IO::Uncompress::UnXz 2.018 ;'; + #eval ' use IO::Uncompress::UnLzma 2.018 ;'; + #eval ' use IO::Uncompress::UnXz 2.018 ;'; } sub new @@ -61,7 +61,8 @@ sub anyuncompress sub getExtraParams { use IO::Compress::Base::Common 2.021 qw(:Parse); - return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; + return ( 'RawInflate' => [1, 1, Parse_boolean, 0] , + 'UnLzma' => [1, 1, Parse_boolean, 0] ) ; } sub ckParams @@ -107,7 +108,7 @@ sub mkUncomp } } -# if (defined $IO::Uncompress::UnLzma::VERSION ) +# if (defined $IO::Uncompress::UnLzma::VERSION && $got->value('UnLzma')) # { # my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnLzma::mkUncompObject(); # @@ -125,21 +126,21 @@ sub mkUncomp # return 1; # } # } - - if (defined $IO::Uncompress::UnXz::VERSION and - $magic = $self->ckMagic('UnXz')) { - *$self->{Info} = $self->readHeader($magic) - or return undef ; - - my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnXz::mkUncompObject(); - - return $self->saveErrorString(undef, $errstr, $errno) - if ! defined $obj; - - *$self->{Uncomp} = $obj; - - return 1; - } +# +# if (defined $IO::Uncompress::UnXz::VERSION and +# $magic = $self->ckMagic('UnXz')) { +# *$self->{Info} = $self->readHeader($magic) +# or return undef ; +# +# my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnXz::mkUncompObject(); +# +# return $self->saveErrorString(undef, $errstr, $errno) +# if ! defined $obj; +# +# *$self->{Uncomp} = $obj; +# +# return 1; +# } if (defined $IO::Uncompress::Bunzip2::VERSION and $magic = $self->ckMagic('Bunzip2')) { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm index 8459ce0e05..eccff87b2c 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm @@ -9,7 +9,7 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS); @ISA = qw(Exporter IO::File); -$VERSION = '2.021'; +$VERSION = '2.022'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm index ce483ea738..22cf65d450 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm @@ -12,7 +12,7 @@ use IO::Uncompress::Adapter::Bunzip2 2.021 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.021'; +$VERSION = '2.022'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm index 8922865d43..41b6d3d4f6 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.021'; +$VERSION = '2.022'; sub new { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm index 20aecc7864..1a22263626 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm @@ -13,7 +13,7 @@ use IO::Uncompress::RawInflate 2.021 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.021'; +$VERSION = '2.022'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm index 5727192e7c..3a45fcdde8 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm @@ -14,7 +14,7 @@ use IO::Uncompress::Adapter::Inflate 2.021 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.021'; +$VERSION = '2.022'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm index 7d08c84edc..c9f638ad2e 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm @@ -30,7 +30,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.021'; +$VERSION = '2.022'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); diff --git a/cpan/IO-Compress/t/01misc.t b/cpan/IO-Compress/t/01misc.t index a7a31fbe15..85cfd37902 100644 --- a/cpan/IO-Compress/t/01misc.t +++ b/cpan/IO-Compress/t/01misc.t @@ -86,11 +86,14 @@ sub My::testParseParameters() like $@, mkErr("Parameter 'Fred' not a scalar"), "wanted scalar"; - #eval { ParseParameters(1, {'Fred' => [1, 1, Parse_any|Parse_multiple, 0]}, Fred => 1, Fred => 2) ; }; - #like $@, mkErr("Muliple instances of 'Fred' found"), - #"wanted scalar"; +# eval { ParseParameters(1, {'Fred' => [1, 1, Parse_any, 0]}, Fred => 1, Fred => 2) ; }; +# like $@, mkErr("Muliple instances of 'Fred' found"), +# "wanted scalar"; - ok 1; + my $g = ParseParameters(1, {'Fred' => [1, 1, Parse_unsigned|Parse_multiple, 7]}, Fred => 1, Fred => 2) ; + is_deeply $g->value('Fred'), [ 1, 2 ] ; + + #ok 1; my $got = ParseParameters(1, {'Fred' => [1, 1, 0x1000000, 0]}, Fred => 'abc') ; is $got->value('Fred'), "abc", "other" ; diff --git a/cpan/IO-Compress/t/compress/CompTestUtils.pm b/cpan/IO-Compress/t/compress/CompTestUtils.pm index cb63d6274c..c5452b6b13 100644 --- a/cpan/IO-Compress/t/compress/CompTestUtils.pm +++ b/cpan/IO-Compress/t/compress/CompTestUtils.pm @@ -16,7 +16,7 @@ use Carp ; sub title { #diag "" ; - ok 1, $_[0] ; + ok(1, $_[0]) ; #diag "" ; } @@ -476,6 +476,7 @@ sub anyUncompress Append => 1, Transparent => 0, RawInflate => 1, + #UnLzma => 1, @opts or croak "Cannot open buffer/file: $AnyUncompressError" ; @@ -537,6 +538,7 @@ sub getHeaders Append => 1, Transparent => 0, RawInflate => 1, + #UnLzma => 1, @opts or croak "Cannot open buffer/file: $AnyUncompressError" ; @@ -647,7 +649,7 @@ sub getMultiValues { my $class = shift ; - return (0,0) if $class =~ /lzf/i; + return (0,0) if $class =~ /lzf|lzma/i; return (1,0); } diff --git a/cpan/IO-Compress/t/compress/any.pl b/cpan/IO-Compress/t/compress/any.pl index d95766b0a9..23a23295aa 100644 --- a/cpan/IO-Compress/t/compress/any.pl +++ b/cpan/IO-Compress/t/compress/any.pl @@ -57,6 +57,7 @@ sub run { my $unc = new $AnyConstruct $input, Transparent => $trans, RawInflate => 1, + #UnLzma => 1, Append => 1 ; ok $unc, " Created $AnyClass object" @@ -76,6 +77,7 @@ sub run { my $unc = new $AnyConstruct $input, Transparent => $trans, RawInflate => 1, + #UnLzma => 1, Append => 1 ; ok $unc, " Created $AnyClass object" diff --git a/cpan/IO-Compress/t/compress/oneshot.pl b/cpan/IO-Compress/t/compress/oneshot.pl index 9c76cefdb5..78d17275b7 100644 --- a/cpan/IO-Compress/t/compress/oneshot.pl +++ b/cpan/IO-Compress/t/compress/oneshot.pl @@ -276,7 +276,7 @@ sub run my $FuncInverse = getTopFuncRef($TopTypeInverse); my @opts = (); - @opts = (RawInflate => 1) + @opts = (RawInflate => 1, UnLzma => 1) if $CompressClass eq 'IO::Compress::RawInflate'; for my $append ( 1, 0 ) @@ -615,7 +615,7 @@ sub run { title "Truncated file"; skip '', 7 - if $CompressClass =~ /lzop|lzf/i ; + if $CompressClass =~ /lzop|lzf|lzma/i ; my @in ; push @in, "abcde" x 10; @@ -1020,7 +1020,7 @@ sub run my $incumbent = "incumbent data" ; my @opts = (Strict => 1); - push @opts, (RawInflate => 1) + push @opts, (RawInflate => 1, UnLzma => 1) if $bit eq 'IO::Uncompress::AnyUncompress'; for my $append (0, 1) @@ -1321,7 +1321,7 @@ sub run my $keep_comp = $comp; my @opts = (); - @opts = (RawInflate => 1) + @opts = (RawInflate => 1, UnLzma => 1) if $bit eq 'IO::Uncompress::AnyUncompress'; my $incumbent = "incumbent data" ; @@ -1407,7 +1407,7 @@ sub run mkdir $tmpDir2, 0777; my @opts = (); - @opts = (RawInflate => 1) + @opts = (RawInflate => 1, UnLzma => 1) if $bit eq 'IO::Uncompress::AnyUncompress'; ok -d $tmpDir1, " Temp Directory $tmpDir1 exists"; diff --git a/cpan/IO-Compress/t/compress/truncate.pl b/cpan/IO-Compress/t/compress/truncate.pl index b362fd3b6e..063355b519 100644 --- a/cpan/IO-Compress/t/compress/truncate.pl +++ b/cpan/IO-Compress/t/compress/truncate.pl @@ -64,7 +64,7 @@ sub run ok $gz; ok ! $gz->error() ; my $buff ; - is $gz->read($buff), length($part) ; + is $gz->read($buff, 5000), length($part) ; ok $buff eq $part ; ok $gz->eof() ; $gz->close(); |