Change 26751 by [EMAIL PROTECTED] on 2006/01/09 10:16:23
Subject: [PATCH] RE: Failing tests on VMS [EMAIL PROTECTED]
From: "Paul Marquess" <[EMAIL PROTECTED]>
Date: Sun, 8 Jan 2006 23:47:33 -0000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/ext/Compress/Zlib/t/03zlib-v1.t#6 edit
... //depot/perl/ext/Compress/Zlib/t/04def.t#6 edit
... //depot/perl/ext/Compress/Zlib/t/05examples.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/06gzsetp.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/08encoding.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/09gziphdr.t#6 edit
... //depot/perl/ext/Compress/Zlib/t/10defhdr.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/11truncate.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/13prime.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/14gzopen.t#6 edit
... //depot/perl/ext/Compress/Zlib/t/15multi.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/16oneshot.t#7 edit
... //depot/perl/ext/Compress/Zlib/t/19destroy.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/20tied.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/21newtied.t#5 edit
... //depot/perl/ext/Compress/Zlib/t/22merge.t#6 edit
... //depot/perl/ext/Compress/Zlib/t/23misc.t#5 edit
... //depot/perl/t/lib/ZlibTestUtils.pm#2 edit
Differences ...
==== //depot/perl/ext/Compress/Zlib/t/03zlib-v1.t#6 (text) ====
Index: perl/ext/Compress/Zlib/t/03zlib-v1.t
--- perl/ext/Compress/Zlib/t/03zlib-v1.t#5~25833~ 2005-10-24
15:44:22.000000000 -0700
+++ perl/ext/Compress/Zlib/t/03zlib-v1.t 2006-01-09 02:16:23.000000000
-0800
@@ -363,7 +363,7 @@
ok $uncomp eq $buffer ;
- unlink $name ;
+ 1 while unlink $name ;
# now check that memGunzip can deal with it.
my $ungzip = Compress::Zlib::memGunzip($dest) ;
@@ -442,7 +442,7 @@
ok ! defined $ungzip ;
- unlink $name ;
+ 1 while unlink $name ;
# check corrupt header -- too short
$dest = "x" ;
@@ -538,7 +538,7 @@
my $unc = Compress::Zlib::memGunzip($compr) ;
ok defined $unc ;
ok $buffer eq $unc ;
- unlink $name ;
+ 1 while unlink $name ;
}
{
==== //depot/perl/ext/Compress/Zlib/t/04def.t#6 (text) ====
Index: perl/ext/Compress/Zlib/t/04def.t
--- perl/ext/Compress/Zlib/t/04def.t#5~25739~ 2005-10-11 15:27:18.000000000
-0700
+++ perl/ext/Compress/Zlib/t/04def.t 2006-01-09 02:16:23.000000000 -0800
@@ -235,8 +235,7 @@
#========================================
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
@@ -273,8 +272,7 @@
#========================================
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
@@ -357,8 +355,7 @@
}
{
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
@@ -521,8 +518,7 @@
#================================
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
@@ -570,8 +566,7 @@
# Write
# these tests come almost 100% from IO::String
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $io = $CompressClass->new($name);
@@ -639,8 +634,7 @@
EOT
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my %opts = () ;
%opts = (CRC32 => 1, Adler32 => 1)
@@ -773,8 +767,7 @@
EOT
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
writeFile($name, $str);
my @tmp;
@@ -905,8 +898,7 @@
{
title "Read Tests - buf length $bufsize, Transparent
$trans, Append $append" ;
- my $name = "testz.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
if ($trans) {
writeFile($name, $str) ;
@@ -950,8 +942,7 @@
my $buffer ;
my $buff ;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $first = "beginning" ;
my $last = "the end" ;
@@ -1055,8 +1046,7 @@
{
title "$CompressClass -- Append $append, Output to $fb" ;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $already = 'already';
my $buffer = $already;
@@ -1128,8 +1118,7 @@
my $comp_len = length $compressed;
$compressed .= $appended;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $input ;
writeFile ($name, $compressed);
@@ -1171,8 +1160,7 @@
{
title "$UncompressClass -- Append $append" ;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $string = "appended";
my $compressed ;
@@ -1207,8 +1195,7 @@
{
title "ungetc, File $file, Transparent $trans" ;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $string = 'abcdeABCDE';
my $b ;
@@ -1372,8 +1359,7 @@
{
title "write tests - invalid data" ;
- #my $name1 = "test.gz" ;
- #my $lex = new LexFile $name1 ;
+ #my $lex = new LexFile my $name1 ;
my $Answer ;
#ok ! -e $name1, " File $name1 does not exist";
==== //depot/perl/ext/Compress/Zlib/t/05examples.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/05examples.t
--- perl/ext/Compress/Zlib/t/05examples.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/05examples.t 2006-01-09 02:16:23.000000000
-0800
@@ -68,9 +68,9 @@
my $file1 = "hello1.gz" ;
my $file2 = "hello2.gz" ;
my $stderr = "err.out" ;
-unlink $stderr ;
-unlink $file1, $file2 ;
+for ($file1, $file2, $stderr) { 1 while unlink $_ } ;
+
my $gz = gzopen($file1, "wb");
$gz->gzwrite($hello1);
@@ -86,7 +86,7 @@
my $expected = shift ;
my $stderr = 'err.out';
- unlink $stderr;
+ 1 while unlink $stderr;
my $cmd = "$command 2>$stderr";
my $stdout = `$cmd` ;
@@ -106,7 +106,7 @@
diag "Test called from $file, line $line";
}
- unlink $stderr;
+ 1 while unlink $stderr;
}
# gzcat
@@ -129,7 +129,7 @@
check "$Perl ${examples}/gzgrep the $file1 $file2",
join('', grep(/the/, @hello1, @hello2));
-unlink $file1, $file2 ;
+for ($file1, $file2) { 1 while unlink $_ } ;
# filtdef/filtinf
==== //depot/perl/ext/Compress/Zlib/t/06gzsetp.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/06gzsetp.t
--- perl/ext/Compress/Zlib/t/06gzsetp.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/06gzsetp.t 2006-01-09 02:16:23.000000000 -0800
@@ -56,8 +56,7 @@
my ($input, $err, $answer, $X, $status, $Answer);
- my $name = "test.gz" ;
- unlink $name ;
+ my $lex = new LexFile my $name;
ok my $x = gzopen($name, "wb");
$input .= $hello;
@@ -90,7 +89,6 @@
ok $k->gzeof ;
ok ! $k->gzclose ;
ok $k->gzeof ;
- unlink $name;
}
==== //depot/perl/ext/Compress/Zlib/t/08encoding.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/08encoding.t
--- perl/ext/Compress/Zlib/t/08encoding.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/08encoding.t 2006-01-09 02:16:23.000000000
-0800
@@ -95,11 +95,11 @@
{
title "gzopen" ;
- my $name = "test.gz" ;
my $s = "\x{df}\x{100}";
my $byte_len = length( Encode::encode_utf8($s) );
my ($uncomp) ;
+ my $lex = new LexFile my $name ;
ok my $fil = gzopen($name, "wb"), " gzopen for write ok" ;
is $fil->gzwrite(Encode::encode_utf8($s)), $byte_len, " wrote $byte_len
bytes" ;
@@ -113,8 +113,6 @@
ok ! $fil->gzclose, "gzclose ok" ;
- unlink $name ;
-
is $s, Encode::decode_utf8($uncomp), " decode_utf8 ok" ;
}
==== //depot/perl/ext/Compress/Zlib/t/09gziphdr.t#6 (text) ====
Index: perl/ext/Compress/Zlib/t/09gziphdr.t
--- perl/ext/Compress/Zlib/t/09gziphdr.t#5~26120~ 2005-11-14
01:39:48.000000000 -0800
+++ perl/ext/Compress/Zlib/t/09gziphdr.t 2006-01-09 02:16:23.000000000
-0800
@@ -37,8 +37,7 @@
my $ThisOS_code = $Compress::Zlib::gzip_os_code;
-my $name = "test.gz" ;
-my $lex = new LexFile $name ;
+my $lex = new LexFile my $name ;
{
title "Check Defaults";
@@ -706,8 +705,7 @@
ok $x->close ;
substr($truncated, $index) = '' ;
- #my $name = "trunc.gz" ;
- #my $lex = new LexFile $name ;
+ #my $lex = new LexFile my $name ;
#writeFile($name, $truncated) ;
#my $g = new IO::Uncompress::Gunzip $name, -Transparent => 0;
@@ -758,8 +756,7 @@
ok $x->close ;
substr($truncated, $index) = '' ;
- #my $name = "trunc.gz" ;
- #my $lex = new LexFile $name ;
+ #my $lex = new LexFile my $name ;
#writeFile($name, $truncated) ;
#my $g = new IO::Uncompress::Gunzip $name, -Transparent => 0;
@@ -784,8 +781,7 @@
ok $x->close ;
substr($truncated, $index) = '' ;
- my $name = "trunc.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
writeFile($name, $truncated) ;
my $g = new IO::Uncompress::Gunzip $name, -Transparent => 0;
==== //depot/perl/ext/Compress/Zlib/t/10defhdr.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/10defhdr.t
--- perl/ext/Compress/Zlib/t/10defhdr.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/10defhdr.t 2006-01-09 02:16:23.000000000 -0800
@@ -107,8 +107,7 @@
# Check the Deflate Header Parameters
#========================================
-my $name = "test.gz" ;
-my $lex = new LexFile $name ;
+my $lex = new LexFile my $name ;
{
title "Check default header settings" ;
==== //depot/perl/ext/Compress/Zlib/t/11truncate.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/11truncate.t
--- perl/ext/Compress/Zlib/t/11truncate.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/11truncate.t 2006-01-09 02:16:23.000000000
-0800
@@ -101,9 +101,7 @@
title "Fingerprint Truncation";
foreach my $i (1)
{
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
ok 1, "Length $i" ;
my $part = substr($compressed, 0, $i);
@@ -134,9 +132,7 @@
#
foreach my $i (2 .. $header_size -1)
{
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
ok 1, "Length $i" ;
my $part = substr($compressed, 0, $i);
@@ -151,9 +147,7 @@
foreach my $i ($header_size .. length($compressed) - 1 - $trailer_size)
{
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
ok 1, "Length $i" ;
my $part = substr($compressed, 0, $i);
@@ -178,9 +172,7 @@
{
foreach my $lax (0, 1)
{
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
ok 1, "Length $i, Lax $lax" ;
my $part = substr($compressed, 0, $i);
@@ -257,9 +249,7 @@
foreach my $i (0 .. $blocksize)
{
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
ok 1, "Length $i" ;
my $part = substr($compressed, 0, $i);
@@ -284,9 +274,7 @@
foreach my $i ($blocksize+1 .. length($compressed)-1)
{
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
ok 1, "Length $i" ;
my $part = substr($compressed, 0, $i);
==== //depot/perl/ext/Compress/Zlib/t/13prime.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/13prime.t
--- perl/ext/Compress/Zlib/t/13prime.t#4~25705~ 2005-10-06 06:23:20.000000000
-0700
+++ perl/ext/Compress/Zlib/t/13prime.t 2006-01-09 02:16:23.000000000 -0800
@@ -99,9 +99,7 @@
for my $useBuf (0 .. 1)
{
print "#\n# BlockSize $blocksize, Length $i, Buffer
$useBuf\n#\n" ;
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $prime = substr($compressed, 0, $i);
my $rest = substr($compressed, $i);
==== //depot/perl/ext/Compress/Zlib/t/14gzopen.t#6 (text) ====
Index: perl/ext/Compress/Zlib/t/14gzopen.t
--- perl/ext/Compress/Zlib/t/14gzopen.t#5~25727~ 2005-10-10
03:27:12.000000000 -0700
+++ perl/ext/Compress/Zlib/t/14gzopen.t 2006-01-09 02:16:23.000000000 -0800
@@ -73,7 +73,7 @@
ok ! $fil->gzclose ;
ok $fil->gzeof() ;
-unlink $name ;
+1 while unlink $name ;
ok $hello eq $uncomp ;
@@ -109,7 +109,7 @@
ok $gzerrno == 0
or print "# gzerrno is $gzerrno\n" ;
-unlink $name ;
+1 while unlink $name ;
ok $number == $uncomp ;
ok $number eq $uncomp ;
@@ -148,7 +148,7 @@
ok $f->gzeof() ;
ok ! $f->gzclose ;
-unlink($file) ;
+1 while unlink($file) ;
# gzip - readline tests
# ======================
@@ -193,7 +193,7 @@
ok $fil->gzeof() ;
ok ! $fil->gzclose ;
ok $fil->gzeof() ;
-unlink($name) ;
+1 while unlink($name) ;
# a text file with a very long line (bigger than the internal buffer)
my $line1 = ("abcdefghijklmnopq" x 2000) . "\n" ;
@@ -220,7 +220,7 @@
ok ! $fil->gzclose ;
ok $fil->gzeof() ;
-unlink $name ;
+1 while unlink $name ;
# a text file which is not termined by an EOL
@@ -246,7 +246,7 @@
ok $fil->gzeof() ;
ok ! $fil->gzclose ;
-unlink $name ;
+1 while unlink $name ;
{
@@ -293,8 +293,6 @@
my $hello = "hello" ;
my $len = length $hello ;
- unlink $name ;
-
my $f = new IO::File ">$name" ;
ok $f;
@@ -316,7 +314,6 @@
ok ! $fil->gzclose ;
ok $fil->gzeof() ;
- unlink $name ;
is $uncomp, $hello, "got expected output" ;
@@ -332,8 +329,6 @@
my $hello = "hello" ;
my $len = length $hello ;
- unlink $name ;
-
open F, ">$name" ;
my $fil;
@@ -354,8 +349,6 @@
ok ! $fil->gzclose ;
ok $fil->gzeof() ;
- unlink $name ;
-
is $uncomp, $hello ;
@@ -373,8 +366,6 @@
my $hello = "hello" ;
my $len = length $hello ;
- unlink $name ;
-
ok open(SAVEOUT, ">&STDOUT"), " save STDOUT";
my $dummy = fileno SAVEOUT;
ok open(STDOUT, ">$name"), " redirect STDOUT" ;
@@ -407,8 +398,6 @@
open(STDIN, "<&SAVEIN");
- unlink $name ;
-
is $uncomp, $hello ;
@@ -420,8 +409,6 @@
my $fil;
- unlink $name ;
-
# missing parameters
eval ' $fil = gzopen() ' ;
like $@, mkEvalErr('Not enough arguments for Compress::Zlib::gzopen'),
@@ -474,8 +461,7 @@
SKIP:
{
- my $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
writeFile($name, "abc");
chmod 0444, $name ;
@@ -494,8 +480,7 @@
SKIP:
{
- my $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
writeFile($name, "abc");
chmod 0222, $name ;
@@ -516,8 +501,7 @@
title "gzseek" ;
my $buff ;
- my $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $first = "beginning" ;
my $last = "the end" ;
==== //depot/perl/ext/Compress/Zlib/t/15multi.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/15multi.t
--- perl/ext/Compress/Zlib/t/15multi.t#4~25705~ 2005-10-06 06:23:20.000000000
-0700
+++ perl/ext/Compress/Zlib/t/15multi.t 2006-01-09 02:16:23.000000000 -0800
@@ -81,8 +81,7 @@
}
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $output ;
if ($fb eq 'buffer')
{
==== //depot/perl/ext/Compress/Zlib/t/16oneshot.t#7 (text) ====
Index: perl/ext/Compress/Zlib/t/16oneshot.t
--- perl/ext/Compress/Zlib/t/16oneshot.t#6~25833~ 2005-10-24
15:44:22.000000000 -0700
+++ perl/ext/Compress/Zlib/t/16oneshot.t 2006-01-09 02:16:23.000000000
-0800
@@ -84,11 +84,10 @@
like $@, mkErr("^$TopType: input filename is undef or null string"),
' Input filename empty' ;
- $in = 'abc';
- my $lex1 = new LexFile($in) ;
- writeFile($in, "abc");
- my $out = $in ;
- eval { $a = $Func->($in, $out) ;} ;
+ my $lex1 = new LexFile my $in1 ;
+ writeFile($in1, "abc");
+ my $out = $in1 ;
+ eval { $a = $Func->($in1, $out) ;} ;
like $@, mkErr("^$TopType: input and output filename are identical"),
' Input and Output filename are the same';
@@ -96,8 +95,7 @@
like $@, mkErr("^$TopType: input and output buffer are identical"),
' Input and Output buffer are the same';
- my $out_file = "abcde.out";
- my $lex = new LexFile($out_file) ;
+ 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"),
@@ -1166,8 +1164,8 @@
my $incumbent = "incumbent data" ;
- my ($file1, $file2) = ("file1", "file2");
- my $lex = new LexFile($file1, $file2) ;
+ #my ($file1, $file2) = ("file1", "file2");
+ my $lex = new LexFile(my $file1, my $file2) ;
writeFile($file1, compressBuffer($TopType,"data1"));
writeFile($file2, compressBuffer($TopType,"data2"));
@@ -1339,10 +1337,7 @@
title "More write tests" ;
- my $file1 = "file1" ;
- my $file2 = "file2" ;
- my $file3 = "file3" ;
- my $lex = new LexFile $file1, $file2, $file3 ;
+ my $lex = new LexFile(my $file1, my $file2, my $file3) ;
writeFile($file1, "F1");
writeFile($file2, "F2");
@@ -1438,8 +1433,7 @@
{
title "Check gzip header default NAME & MTIME settings" ;
- my $file1 = "file1" ;
- my $lex = new LexFile $file1;
+ my $lex = new LexFile my $file1;
my $content = "hello ";
my $hdr ;
==== //depot/perl/ext/Compress/Zlib/t/19destroy.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/19destroy.t
--- perl/ext/Compress/Zlib/t/19destroy.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/19destroy.t 2006-01-09 02:16:23.000000000
-0800
@@ -43,9 +43,7 @@
{
# Check that the class destructor will call close
- my $name = "test.gz" ;
- unlink $name ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
@@ -66,8 +64,7 @@
# Tied filehandle destructor
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
==== //depot/perl/ext/Compress/Zlib/t/20tied.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/20tied.t
--- perl/ext/Compress/Zlib/t/20tied.t#4~25705~ 2005-10-06 06:23:20.000000000
-0700
+++ perl/ext/Compress/Zlib/t/20tied.t 2006-01-09 02:16:23.000000000 -0800
@@ -152,8 +152,7 @@
# Write
# these tests come almost 100% from IO::String
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $io = $CompressClass->new($name);
@@ -216,8 +215,7 @@
EOT
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $iow = new $CompressClass $name ;
print $iow $str ;
@@ -348,8 +346,7 @@
EOT
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
writeFile($name, $str);
my @tmp;
@@ -480,8 +477,7 @@
{
title "Read Tests - buf length $bufsize, Transparent
$trans, Append $append" ;
- my $name = "testz.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
if ($trans) {
writeFile($name, $str) ;
==== //depot/perl/ext/Compress/Zlib/t/21newtied.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/21newtied.t
--- perl/ext/Compress/Zlib/t/21newtied.t#4~25705~ 2005-10-06
06:23:20.000000000 -0700
+++ perl/ext/Compress/Zlib/t/21newtied.t 2006-01-09 02:16:23.000000000
-0800
@@ -99,8 +99,7 @@
# Write
# these tests come almost 100% from IO::String
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $io = $CompressClass->new($name);
@@ -167,8 +166,7 @@
EOT
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $iow = new $CompressClass $name ;
print $iow $str ;
@@ -299,8 +297,7 @@
{
title "seek tests" ;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $first = "beginning" ;
my $last = "the end" ;
@@ -360,8 +357,7 @@
{
title 'fileno' ;
- my $name = "test.gz" ;
- my $lex = new LexFile $name ;
+ my $lex = new LexFile my $name ;
my $hello = <<EOM ;
hello world
==== //depot/perl/ext/Compress/Zlib/t/22merge.t#6 (text) ====
Index: perl/ext/Compress/Zlib/t/22merge.t
--- perl/ext/Compress/Zlib/t/22merge.t#5~25833~ 2005-10-24 15:44:22.000000000
-0700
+++ perl/ext/Compress/Zlib/t/22merge.t 2006-01-09 02:16:23.000000000 -0800
@@ -78,8 +78,7 @@
else
{ title "$CompressClass - Merge to filehandle that isn't writable" }
- my $out_file = 'abcde.out';
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
# create empty file
open F, ">$out_file" ; print F "x"; close F;
@@ -129,8 +128,7 @@
my $Error = getErrorRef($CompressClass);
- my $out_file = 'abcde.out';
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
foreach my $to_file ( qw(buffer file handle ) )
{
@@ -172,8 +170,7 @@
my $Error = getErrorRef($CompressClass);
- my $out_file = 'abcde.out';
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
foreach my $to_file ( qw(buffer file handle ) )
{
@@ -219,8 +216,7 @@
title "$CompressClass - Merge to file that doesn't exist";
- my $out_file = 'abcd.out';
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
ok ! -e $out_file, " Destination file, '$out_file', does not exist";
@@ -240,8 +236,7 @@
{
my $Error = getErrorRef($CompressClass);
- my $out_file = 'abcde.out';
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
foreach my $to_file ( qw( buffer file handle ) )
{
@@ -322,8 +317,7 @@
my $buffer ;
- my $out_file = 'abcde.out';
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
foreach my $to_file (0, 1)
{
==== //depot/perl/ext/Compress/Zlib/t/23misc.t#5 (text) ====
Index: perl/ext/Compress/Zlib/t/23misc.t
--- perl/ext/Compress/Zlib/t/23misc.t#4~25705~ 2005-10-06 06:23:20.000000000
-0700
+++ perl/ext/Compress/Zlib/t/23misc.t 2006-01-09 02:16:23.000000000 -0800
@@ -91,8 +91,7 @@
{
title "whatIsInput" ;
- my $out_file = "abc";
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
open FH, ">$out_file" ;
is whatIsInput(*FH), 'handle', "Match filehandle" ;
close FH ;
@@ -111,8 +110,7 @@
{
title "whatIsOutput" ;
- my $out_file = "abc";
- my $lex = new LexFile($out_file) ;
+ my $lex = new LexFile my $out_file ;
open FH, ">$out_file" ;
is whatIsOutput(*FH), 'handle', "Match filehandle" ;
close FH ;
==== //depot/perl/t/lib/ZlibTestUtils.pm#2 (text) ====
Index: perl/t/lib/ZlibTestUtils.pm
--- perl/t/lib/ZlibTestUtils.pm#1~25705~ 2005-10-06 06:23:20.000000000
-0700
+++ perl/t/lib/ZlibTestUtils.pm 2006-01-09 02:16:23.000000000 -0800
@@ -36,7 +36,7 @@
unless defined $_;
}
chmod 0777, @_;
- unlink @_ ;
+ for (@_) { 1 while unlink $_ } ;
bless [ @_ ], $self ;
}
@@ -44,7 +44,7 @@
{
my $self = shift ;
chmod 0777, @{ $self } ;
- unlink @{ $self } ;
+ for (@$self) { 1 while unlink $_ } ;
}
}
End of Patch.
