Change 13940 by jhi@alpha on 2001/12/29 20:22:57
Subject: [PATCH] cleaner close on tests, take 2
From: [EMAIL PROTECTED] (Andreas J. Koenig)
Date: 29 Dec 2001 21:42:37 +0100
Message-ID: <[EMAIL PROTECTED]>
(except for the three DB_File patch fragments)
Affected files ...
.... //depot/perl/ext/Devel/DProf/DProf.t#2 edit
.... //depot/perl/ext/PerlIO/t/encoding.t#7 edit
.... //depot/perl/ext/SDBM_File/sdbm.t#3 edit
.... //depot/perl/ext/Storable/t/store.t#2 edit
.... //depot/perl/lib/strict.t#4 edit
.... //depot/perl/t/cmd/while.t#11 edit
.... //depot/perl/t/comp/cpp.aux#8 edit
.... //depot/perl/t/comp/multiline.t#11 edit
.... //depot/perl/t/comp/require.t#22 edit
.... //depot/perl/t/comp/script.t#12 edit
.... //depot/perl/t/io/argv.t#17 edit
.... //depot/perl/t/io/dup.t#13 edit
.... //depot/perl/t/lib/filter-util.pl#5 edit
.... //depot/perl/t/op/anonsub.t#5 edit
.... //depot/perl/t/op/do.t#14 edit
.... //depot/perl/t/op/inccode.t#8 edit
.... //depot/perl/t/op/runlevel.t#22 edit
.... //depot/perl/t/op/write.t#21 edit
.... //depot/perl/t/run/switches.t#4 edit
Differences ...
==== //depot/perl/ext/Devel/DProf/DProf.t#2 (text) ====
Index: perl/ext/Devel/DProf/DProf.t
--- perl/ext/Devel/DProf/DProf.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/ext/Devel/DProf/DProf.t Sat Dec 29 13:30:05 2001
@@ -49,7 +49,7 @@
my $t_start = new Benchmark;
open( R, "$perl \"$opt_d\" $test |" ) || warn "$0: Can't run. $!\n";
@results = <R>;
- close R;
+ close R or warn "Could not close: $!";
my $t_total = timediff( new Benchmark, $t_start );
if( $opt_v ){
==== //depot/perl/ext/PerlIO/t/encoding.t#7 (text) ====
Index: perl/ext/PerlIO/t/encoding.t
--- perl/ext/PerlIO/t/encoding.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/ext/PerlIO/t/encoding.t Sat Dec 29 13:30:05 2001
@@ -19,7 +19,7 @@
if (open(GRK, ">$grk")) {
# alpha beta gamma in ISO 8859-7
print GRK "\xe1\xe2\xe3";
- close GRK;
+ close GRK or die "Could not close: $!";
}
{
@@ -30,7 +30,7 @@
print "ok 2\n";
print $o readline($i);
print "ok 3\n";
- close($o);
+ close($o) or die "Could not close: $!";
close($i);
}
@@ -49,7 +49,7 @@
print "ok 6\n";
print $o readline($i);
print "ok 7\n";
- close($o);
+ close($o) or die "Could not close: $!";
close($i);
}
@@ -76,7 +76,7 @@
if (open(RUSSKI, ">$russki")) {
print RUSSKI "\x3c\x3f\x78";
- close RUSSKI;
+ close RUSSKI or die "Could not close: $!";
open(RUSSKI, "$russki");
binmode(RUSSKI, ":raw");
my $buf1;
==== //depot/perl/ext/SDBM_File/sdbm.t#3 (text) ====
Index: perl/ext/SDBM_File/sdbm.t
--- perl/ext/SDBM_File/sdbm.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/ext/SDBM_File/sdbm.t Sat Dec 29 13:30:05 2001
@@ -183,7 +183,7 @@
1 ;
EOM
- close FILE ;
+ close FILE or die "Could not close: $!";
BEGIN { push @INC, '.'; }
==== //depot/perl/ext/Storable/t/store.t#2 (text) ====
Index: perl/ext/Storable/t/store.t
--- perl/ext/Storable/t/store.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/ext/Storable/t/store.t Sat Dec 29 13:30:05 2001
@@ -113,7 +113,7 @@
print "not " unless $@;
print "ok 20\n";
-close OUT;
+close OUT or die "Could not close: $!";
END { 1 while unlink 'store' }
==== //depot/perl/lib/strict.t#4 (text) ====
Index: perl/lib/strict.t
--- perl/lib/strict.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/lib/strict.t Sat Dec 29 13:30:05 2001
@@ -31,7 +31,7 @@
local $/ = undef;
@prgs = (@prgs, split "\n########\n", <F>) ;
}
- close F ;
+ close F or die "Could not close: $!" ;
}
undef $/;
@@ -59,7 +59,7 @@
push @temps, $filename ;
open F, ">$filename" or die "Cannot open $filename: $!\n" ;
print F $code ;
- close F ;
+ close F or die "Could not close: $!" ;
}
shift @files ;
$prog = shift @files ;
@@ -67,7 +67,7 @@
}
open TEST, ">$tmpfile";
print TEST $prog,"\n";
- close TEST;
+ close TEST or die "Could not close: $!";
my $results = $Is_MSWin32 ?
`.\\perl -I../lib $switch $tmpfile 2>&1` :
$^O eq 'NetWare' ?
==== //depot/perl/t/cmd/while.t#11 (xtext) ====
Index: perl/t/cmd/while.t
--- perl/t/cmd/while.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/cmd/while.t Sat Dec 29 13:30:05 2001
@@ -8,7 +8,7 @@
print tmp "vt100\n";
print tmp "Amiga\n";
print tmp "paper\n";
-close tmp;
+close tmp or die "Could not close: $!";
# test "last" command
==== //depot/perl/t/comp/cpp.aux#8 (xtext) ====
Index: perl/t/comp/cpp.aux
--- perl/t/comp/cpp.aux.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/comp/cpp.aux Sat Dec 29 13:30:05 2001
@@ -25,11 +25,11 @@
Xprint $ok;
END
print TRY $prog;
-close TRY;
+close TRY or die "Could not close Comp_cpp.tmp: $!";
open(TRY,">Comp_cpp.inc") || (die "Can't open temp include file: $!");
print TRY '#define OK "ok 3\n"' . "\n";
-close TRY;
+close TRY or die "Could not close Comp_cpp.tmp: $!";
print `$^X "-P" Comp_cpp.tmp`;
unlink "Comp_cpp.tmp", "Comp_cpp.inc";
==== //depot/perl/t/comp/multiline.t#11 (xtext) ====
Index: perl/t/comp/multiline.t
--- perl/t/comp/multiline.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/comp/multiline.t Sat Dec 29 13:30:05 2001
@@ -26,7 +26,7 @@
is($x, $y, 'test data is sane');
print TRY $x;
-close TRY;
+close TRY or die "Could not close: $!";
open(TRY,'Comp.try') || (die "Can't reopen temp file.");
$count = 0;
==== //depot/perl/t/comp/require.t#22 (xtext) ====
Index: perl/t/comp/require.t
--- perl/t/comp/require.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/comp/require.t Sat Dec 29 13:30:05 2001
@@ -27,7 +27,7 @@
binmode REQ;
use bytes;
print REQ @_;
- close REQ;
+ close REQ or die "Could not close $f: $!";
}
eval {require 5.005};
==== //depot/perl/t/comp/script.t#12 (xtext) ====
Index: perl/t/comp/script.t
--- perl/t/comp/script.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/comp/script.t Sat Dec 29 13:30:05 2001
@@ -16,7 +16,7 @@
open(try,">Comp.script") || (die "Can't open temp file.");
print try 'print "ok\n";'; print try "\n";
-close try;
+close try or die "Could not close: $!";
$x = `$Perl Comp.script`;
==== //depot/perl/t/io/argv.t#17 (xtext) ====
Index: perl/t/io/argv.t
--- perl/t/io/argv.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/io/argv.t Sat Dec 29 13:30:05 2001
@@ -15,7 +15,7 @@
open(TRY, '>Io_argv1.tmp') || (die "Can't open temp file: $!");
print TRY "a line\n";
-close TRY;
+close TRY or die "Could not close: $!";
$x = runperl(
prog => 'while (<>) { print $., $_; }',
@@ -50,9 +50,9 @@
open(TRY, '>Io_argv1.tmp') or die "Can't open temp file: $!";
-close TRY;
+close TRY or die "Could not close: $!";
open(TRY, '>Io_argv2.tmp') or die "Can't open temp file: $!";
-close TRY;
+close TRY or die "Could not close: $!";
@ARGV = ('Io_argv1.tmp', 'Io_argv2.tmp');
$^I = '_bak'; # not .bak which confuses VMS
$/ = undef;
@@ -67,7 +67,7 @@
print while <TRY>;
open(TRY, '<Io_argv2.tmp') or die "Can't open temp file: $!";
print while <TRY>;
-close TRY;
+close TRY or die "Could not close: $!";
undef $^I;
ok( eof TRY );
@@ -95,7 +95,7 @@
{
local $/;
- open F, 'Io_argv1.tmp' or die;
+ open F, 'Io_argv1.tmp' or die "Could not open Io_argv1.tmp: $!";
<F>; # set $. = 1
is( <F>, undef );
@@ -108,7 +108,7 @@
open F, $devnull or die; # restart cycle again
ok( defined(<F>) );
is( <F>, undef );
- close F;
+ close F or die "Could not close: $!";
}
END { unlink 'Io_argv1.tmp', 'Io_argv1.tmp_bak', 'Io_argv2.tmp', 'Io_argv2.tmp_bak' }
==== //depot/perl/t/io/dup.t#13 (xtext) ====
Index: perl/t/io/dup.t
--- perl/t/io/dup.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/io/dup.t Sat Dec 29 13:30:05 2001
@@ -40,11 +40,11 @@
system sprintf "$echo 1>&2", 7;
}
-close(STDOUT);
-close(STDERR);
+close(STDOUT) or die "Could not close: $!";
+close(STDERR) or die "Could not close: $!";
-open(STDOUT,">&DUPOUT");
-open(STDERR,">&DUPERR");
+open(STDOUT,">&DUPOUT") or die "Could not open: $!";
+open(STDERR,">&DUPERR") or die "Could not open: $!";
if (($^O eq 'MSWin32') || ($^O eq 'NetWare') || ($^O eq 'VMS')) { print `type Io.dup`
}
else { system 'cat Io.dup' }
==== //depot/perl/t/lib/filter-util.pl#5 (text) ====
Index: perl/t/lib/filter-util.pl
--- perl/t/lib/filter-util.pl.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/lib/filter-util.pl Sat Dec 29 13:30:05 2001
@@ -25,7 +25,7 @@
binmode(F) if $filename =~ /bin$/i;
foreach (@strings)
{ print F }
- close F ;
+ close F or die "Could not close: $!" ;
}
sub ok
==== //depot/perl/t/op/anonsub.t#5 (xtext) ====
Index: perl/t/op/anonsub.t
--- perl/t/op/anonsub.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/op/anonsub.t Sat Dec 29 13:30:05 2001
@@ -26,7 +26,7 @@
my($prog,$expected) = split(/\nEXPECT\n/, $_);
open TEST, ">$tmpfile";
print TEST "$prog\n";
- close TEST;
+ close TEST or die "Could not close: $!";
my $results = $Is_VMS ?
`MCR $^X "-I[-.lib]" $switch $tmpfile 2>&1` :
$Is_MSWin32 ?
==== //depot/perl/t/op/do.t#14 (xtext) ====
Index: perl/t/op/do.t
--- perl/t/op/do.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/op/do.t Sat Dec 29 13:30:05 2001
@@ -61,31 +61,31 @@
if (open(DO, ">$$.16")) {
print DO "ok(1, 'do in scalar context') if defined wantarray && not wantarray\n";
- close DO;
+ close DO or die "Could not close: $!";
}
my $a = do "$$.16";
if (open(DO, ">$$.17")) {
print DO "ok(1, 'do in list context') if defined wantarray && wantarray\n";
- close DO;
+ close DO or die "Could not close: $!";
}
my @a = do "$$.17";
if (open(DO, ">$$.18")) {
print DO "ok(1, 'do in void context') if not defined wantarray\n";
- close DO;
+ close DO or die "Could not close: $!";
}
do "$$.18";
# bug ID 20010920.007
eval qq{ do qq(a file that does not exist); };
-ok( !$@ );
+ok( !$@, "do on a non-existing file, first try" );
eval qq{ do uc qq(a file that does not exist); };
-ok( !$@ );
+ok( !$@, "do on a non-existing file, second try" );
END {
1 while unlink("$$.16", "$$.17", "$$.18");
==== //depot/perl/t/op/inccode.t#8 (text) ====
Index: perl/t/op/inccode.t
--- perl/t/op/inccode.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/op/inccode.t Sat Dec 29 13:30:05 2001
@@ -20,7 +20,7 @@
push @tempfiles, $f;
open my $fh, ">$f" or die "Can't create $f: $!";
print $fh "package ".substr($_[0],0,-3)."; 1;";
- close $fh;
+ close $fh or die "Couldn't close: $!";
open $fh, $f or die "Can't open $f: $!";
return $fh;
}
@@ -39,22 +39,29 @@
push @INC, \&fooinc;
-ok( !eval { require Bar; 1 }, 'Trying non-magic package' );
+my $evalret = eval { require Bar; 1 };
+ok( !$evalret, 'Trying non-magic package' );
-ok( eval { require Foo; 1 }, 'require() magic via code ref' );
-ok( exists $INC{'Foo.pm'}, ' %INC sees it' );
-is( ref $INC{'Foo.pm'}, 'CODE', ' key is a coderef in %INC' );
-is( $INC{'Foo.pm'}, \&fooinc, ' key is correct in %INC' );
+$evalret = eval { require Foo; 1 };
+die $@ if $@;
+ok( $evalret, 'require Foo; magic via code ref' );
+ok( exists $INC{'Foo.pm'}, ' %INC sees Foo.pm' );
+is( ref $INC{'Foo.pm'}, 'CODE', ' val Foo.pm is a coderef in %INC' );
+is( $INC{'Foo.pm'}, \&fooinc, ' val Foo.pm is correct in %INC' );
-ok( eval "use Foo1; 1;", 'use()' );
-ok( exists $INC{'Foo1.pm'}, ' %INC sees it' );
-is( ref $INC{'Foo1.pm'}, 'CODE', ' key is a coderef in %INC' );
-is( $INC{'Foo1.pm'}, \&fooinc, ' key is correct in %INC' );
+$evalret = eval "use Foo1; 1;";
+die $@ if $@;
+ok( $evalret, 'use Foo1' );
+ok( exists $INC{'Foo1.pm'}, ' %INC sees Foo1.pm' );
+is( ref $INC{'Foo1.pm'}, 'CODE', ' val Foo1.pm is a coderef in %INC' );
+is( $INC{'Foo1.pm'}, \&fooinc, ' val Foo1.pm is correct in %INC' );
-ok( eval { do 'Foo2.pl'; 1 }, 'do()' );
-ok( exists $INC{'Foo2.pl'}, ' %INC sees it' );
-is( ref $INC{'Foo2.pl'}, 'CODE', ' key is a coderef in %INC' );
-is( $INC{'Foo2.pl'}, \&fooinc, ' key is correct in %INC' );
+$evalret = eval { do 'Foo2.pl'; 1 };
+die $@ if $@;
+ok( $evalret, 'do "Foo2.pl"' );
+ok( exists $INC{'Foo2.pl'}, ' %INC sees Foo2.pl' );
+is( ref $INC{'Foo2.pl'}, 'CODE', ' val Foo2.pl is a coderef in %INC' );
+is( $INC{'Foo2.pl'}, \&fooinc, ' val Foo2.pl is correct in %INC' );
pop @INC;
@@ -72,23 +79,28 @@
my $arrayref = [ \&fooinc2, 'Bar' ];
push @INC, $arrayref;
-ok( eval { require Foo; 1; }, 'Originally loaded packages preserved' );
-ok( !eval { require Foo3; 1; }, 'Original magic INC purged' );
+$evalret = eval { require Foo; 1; };
+die $@ if $@;
+ok( $evalret, 'Originally loaded packages preserved' );
+$evalret = eval { require Foo3; 1; };
+ok( !$evalret, 'Original magic INC purged' );
-ok( eval { require Bar; 1 }, 'require() magic via array ref' );
-ok( exists $INC{'Bar.pm'}, ' %INC sees it' );
-is( ref $INC{'Bar.pm'}, 'ARRAY', ' key is an arrayref in %INC' );
-is( $INC{'Bar.pm'}, $arrayref, ' key is correct in %INC' );
+$evalret = eval { require Bar; 1 };
+die $@ if $@;
+ok( $evalret, 'require Bar; magic via array ref' );
+ok( exists $INC{'Bar.pm'}, ' %INC sees Bar.pm' );
+is( ref $INC{'Bar.pm'}, 'ARRAY', ' val Bar.pm is an arrayref in %INC' );
+is( $INC{'Bar.pm'}, $arrayref, ' val Bar.pm is correct in %INC' );
-ok( eval "use Bar1; 1;", 'use()' );
-ok( exists $INC{'Bar1.pm'}, ' %INC sees it' );
-is( ref $INC{'Bar1.pm'}, 'ARRAY', ' key is an arrayref in %INC' );
-is( $INC{'Bar1.pm'}, $arrayref, ' key is correct in %INC' );
+ok( eval "use Bar1; 1;", 'use Bar1' );
+ok( exists $INC{'Bar1.pm'}, ' %INC sees Bar1.pm' );
+is( ref $INC{'Bar1.pm'}, 'ARRAY', ' val Bar1.pm is an arrayref in %INC' );
+is( $INC{'Bar1.pm'}, $arrayref, ' val Bar1.pm is correct in %INC' );
-ok( eval { do 'Bar2.pl'; 1 }, 'do()' );
-ok( exists $INC{'Bar2.pl'}, ' %INC sees it' );
-is( ref $INC{'Bar2.pl'}, 'ARRAY', ' key is an arrayref in %INC' );
-is( $INC{'Bar2.pl'}, $arrayref, ' key is correct in %INC' );
+ok( eval { do 'Bar2.pl'; 1 }, 'do "Bar2.pl"' );
+ok( exists $INC{'Bar2.pl'}, ' %INC sees Bar2.pl' );
+is( ref $INC{'Bar2.pl'}, 'ARRAY', ' val Bar2.pl is an arrayref in %INC' );
+is( $INC{'Bar2.pl'}, $arrayref, ' val Bar2.pl is correct in %INC' );
pop @INC;
@@ -105,33 +117,39 @@
my $href = bless( {}, 'FooLoader' );
push @INC, $href;
-ok( eval { require Quux; 1 }, 'require() magic via hash object' );
-ok( exists $INC{'Quux.pm'}, ' %INC sees it' );
+$evalret = eval { require Quux; 1 };
+die $@ if $@;
+ok( $evalret, 'require Quux; magic via hash object' );
+ok( exists $INC{'Quux.pm'}, ' %INC sees Quux.pm' );
is( ref $INC{'Quux.pm'}, 'FooLoader',
- ' key is an object in %INC' );
-is( $INC{'Quux.pm'}, $href, ' key is correct in %INC' );
+ ' val Quux.pm is an object in %INC' );
+is( $INC{'Quux.pm'}, $href, ' val Quux.pm is correct in %INC' );
pop @INC;
my $aref = bless( [], 'FooLoader' );
push @INC, $aref;
-ok( eval { require Quux1; 1 }, 'require() magic via array object' );
-ok( exists $INC{'Quux1.pm'}, ' %INC sees it' );
+$evalret = eval { require Quux1; 1 };
+die $@ if $@;
+ok( $evalret, 'require Quux1; magic via array object' );
+ok( exists $INC{'Quux1.pm'}, ' %INC sees Quux1.pm' );
is( ref $INC{'Quux1.pm'}, 'FooLoader',
- ' key is an object in %INC' );
-is( $INC{'Quux1.pm'}, $aref, ' key is correct in %INC' );
+ ' val Quux1.pm is an object in %INC' );
+is( $INC{'Quux1.pm'}, $aref, ' val Quux1.pm is correct in %INC' );
pop @INC;
my $sref = bless( \(my $x = 1), 'FooLoader' );
push @INC, $sref;
-ok( eval { require Quux2; 1 }, 'require() magic via scalar object' );
-ok( exists $INC{'Quux2.pm'}, ' %INC sees it' );
+$evalret = eval { require Quux2; 1 };
+die $@ if $@;
+ok( $evalret, 'require Quux2; magic via scalar object' );
+ok( exists $INC{'Quux2.pm'}, ' %INC sees Quux2.pm' );
is( ref $INC{'Quux2.pm'}, 'FooLoader',
- ' key is an object in %INC' );
-is( $INC{'Quux2.pm'}, $sref, ' key is correct in %INC' );
+ ' val Quux2.pm is an object in %INC' );
+is( $INC{'Quux2.pm'}, $sref, ' val Quux2.pm is correct in %INC' );
pop @INC;
@@ -146,9 +164,11 @@
}
};
-ok( eval { require Toto; 1 }, 'require() magic via anonymous code ref' );
-ok( exists $INC{'Toto.pm'}, ' %INC sees it' );
-ok( ! ref $INC{'Toto.pm'}, q/ key isn't a ref in %INC/ );
-is( $INC{'Toto.pm'}, 'xyz', ' key is correct in %INC' );
+$evalret = eval { require Toto; 1 };
+die $@ if $@;
+ok( $evalret, 'require Toto; magic via anonymous code ref' );
+ok( exists $INC{'Toto.pm'}, ' %INC sees Toto.pm' );
+ok( ! ref $INC{'Toto.pm'}, q/ val Toto.pm isn't a ref in %INC/ );
+is( $INC{'Toto.pm'}, 'xyz', ' val Toto.pm is correct in %INC' );
pop @INC;
==== //depot/perl/t/op/runlevel.t#22 (xtext) ====
Index: perl/t/op/runlevel.t
--- perl/t/op/runlevel.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/op/runlevel.t Sat Dec 29 13:30:05 2001
@@ -31,7 +31,7 @@
my($prog,$expected) = split(/\nEXPECT\n/, $_);
open TEST, ">$tmpfile";
print TEST "$prog\n";
- close TEST;
+ close TEST or die "Could not close: $!";
my $results = $Is_VMS ?
`MCR $^X "-I[-.lib]" $switch $tmpfile 2>&1` :
$Is_MSWin32 ?
==== //depot/perl/t/op/write.t#21 (xtext) ====
Index: perl/t/op/write.t
--- perl/t/op/write.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/op/write.t Sat Dec 29 13:30:05 2001
@@ -36,7 +36,7 @@
$multiline = "forescore\nand\nseven years\n";
$foo = 'when in the course of human events it becomes necessary';
write(OUT);
-close OUT;
+close OUT or die "Could not close: $!";
$right =
"the quick brown fox
@@ -75,7 +75,7 @@
$multiline = "forescore\nand\nseven years\n";
$foo = 'when in the course of human events it becomes necessary';
write(OUT2);
-close OUT2;
+close OUT2 or die "Could not close: $!";
$right =
"the quick brown fox
@@ -118,7 +118,7 @@
$multiline = "forescore\nand\nseven years\n";
$foo = 'when in the course of human events it becomes necessary';
write(OUT2);
-close OUT2;
+close OUT2 or die "Could not close: $!";
$right =
"the brown quick fox
@@ -185,7 +185,7 @@
$foo = 'fit ';
write(OUT3);
-close OUT3;
+close OUT3 or die "Could not close: $!";
$right =
"fit\n";
@@ -207,7 +207,7 @@
write LEX;
$that = 8;
write LEX;
- close LEX;
+ close LEX or die "Could not close: $!";
}
# LEX_INTERPNORMAL test
my %e = ( a => 1 );
@@ -217,7 +217,7 @@
.
open OUT4, ">Op_write.tmp" or die "Can't create Op_write.tmp";
write (OUT4);
-close OUT4;
+close OUT4 or die "Could not close: $!";
if (`$CAT Op_write.tmp` eq "1\n") {
print "ok 9\n";
1 while unlink "Op_write.tmp";
@@ -237,7 +237,7 @@
$test1 = 12.95;
write(OUT10);
-close OUT10;
+close OUT10 or die "Could not close: $!";
$right = " 12.95 00012.95\n";
if (`$CAT Op_write.tmp` eq $right)
@@ -260,7 +260,7 @@
$test1 = 12.95;
write(OUT11);
-close OUT11;
+close OUT11 or die "Could not close: $!";
$right =
"00012.95
==== //depot/perl/t/run/switches.t#4 (text) ====
Index: perl/t/run/switches.t
--- perl/t/run/switches.t.~1~ Sat Dec 29 13:30:05 2001
+++ perl/t/run/switches.t Sat Dec 29 13:30:05 2001
@@ -77,7 +77,7 @@
print "block 4\n";
END { print "block 5\n"; }
SWTEST
- close $f;
+ close $f or die "Could not close: $!";
$r = runperl(
switches => [ '-c' ],
progfile => $filename,
@@ -122,7 +122,7 @@
#!perl -s
print $x
SWTEST
- close $f;
+ close $f or die "Could not close: $!";
$r = runperl(
switches => [ '-s' ],
progfile => $filename,
@@ -142,7 +142,7 @@
sub import { print map "<$_>", @_ }
1;
SWTESTPM
- close $f;
+ close $f or die "Could not close: $!";
$r = runperl(
switches => [ '-Mswtest' ],
prog => '1',
End of Patch.
