diff options
| author | Paul Marquess <paul.marquess@btinternet.com> | 2006-12-29 20:50:26 +0000 |
|---|---|---|
| committer | Steve Peters <steve@fisharerojo.org> | 2006-12-30 05:55:53 +0000 |
| commit | f6fd7794b9baf00eb9b1d47e4ad481f2e8866e76 (patch) | |
| tree | 2caa94f5eb3d6ee23b0a6aaf07ae936066acae5c /t | |
| parent | f8babb2524be4b18ced06634d930c03291c1f313 (diff) | |
| download | perl-f6fd7794b9baf00eb9b1d47e4ad481f2e8866e76.tar.gz | |
Update Compress Modules to version 2.002
From: "Paul Marquess" <Paul.Marquess@ntlworld.com>
Message-ID: <000501c72b8a$f96b2ba0$6401a8c0@myopwv.com>
p4raw-id: //depot/perl@29641
Diffstat (limited to 't')
| -rw-r--r-- | t/lib/compress/CompTestUtils.pm | 7 | ||||
| -rw-r--r-- | t/lib/compress/multi.pl | 2 | ||||
| -rw-r--r-- | t/lib/compress/oneshot.pl | 26 |
3 files changed, 26 insertions, 9 deletions
diff --git a/t/lib/compress/CompTestUtils.pm b/t/lib/compress/CompTestUtils.pm index 85d53bad5f..1763b0309d 100644 --- a/t/lib/compress/CompTestUtils.pm +++ b/t/lib/compress/CompTestUtils.pm @@ -616,6 +616,13 @@ sub getMultiValues return (1,0); } + +sub gotScalarUtilXS +{ + eval ' use Scalar::Util "dualvar" '; + return $@ ? 0 : 1 ; +} + package CompTestUtils; 1; diff --git a/t/lib/compress/multi.pl b/t/lib/compress/multi.pl index 9daff1a107..cfb5666f6c 100644 --- a/t/lib/compress/multi.pl +++ b/t/lib/compress/multi.pl @@ -129,7 +129,7 @@ EOM ok $gz->close(), " close() ok" or diag "errno $!\n" ; - is $gz->streamCount(), $i +1, " streamCount ok" + is $gz->streamCount(), $i +1, " streamCount ok " . ($i +1) or diag "Stream count is " . $gz->streamCount(); ok $un eq join('', @buffs), " expected output" ; diff --git a/t/lib/compress/oneshot.pl b/t/lib/compress/oneshot.pl index ebfd042359..6fdd4c9a71 100644 --- a/t/lib/compress/oneshot.pl +++ b/t/lib/compress/oneshot.pl @@ -95,14 +95,24 @@ sub run like $@, mkErr("^$TopType: input and output buffer are identical"), ' Input and Output buffer are the same'; - my $lex = new LexFile my $out_file ; - open OUT, ">$out_file" ; - eval { $a = $Func->(\*OUT, \*OUT) ;} ; - like $@, mkErr("^$TopType: input and output handle are identical"), - ' Input and Output handle are the same'; - - close OUT; - is -s $out_file, 0, " File zero length" ; + SKIP: + { + # Threaded 5.6.x seems to have a problem comparing filehandles. + use Config; + + skip 'Cannot compare filehandles with threaded $]', 2 + if $] >= 5.006 && $] < 5.007 && $Config{useithreads}; + + my $lex = new LexFile my $out_file ; + open OUT, ">$out_file" ; + eval { $a = $Func->(\*OUT, \*OUT) ;} ; + like $@, mkErr("^$TopType: input and output handle are identical"), + ' Input and Output handle are the same'; + + close OUT; + is -s $out_file, 0, " File zero length" ; + } + { my %x = () ; my $object = bless \%x, "someClass" ; |