Integrate mainline (Win2k/MinGW all ok except threads/t/end.t)

[p5sagit/p5-mst-13.2.git] / ext / B / t / xref.t

diff --git a/ext/B/t/xref.t b/ext/B/t/xref.t
index 8b14355..b1d0bc0 100644 (file)
--- a/ext/B/t/xref.t
+++ b/ext/B/t/xref.t
@@ -1,4 +1,4 @@
-#!./perl -w
+#!./perl
 
 BEGIN {
     chdir 't' if -d 't';
@@ -6,6 +6,8 @@ BEGIN {
 }
 
 use strict;
+use warnings;
+no warnings 'once';
 use Test::More tests => 14;
 
 # line 50
@@ -13,12 +15,14 @@ use_ok( 'B::Xref' );
 
 my $file = 'xreftest.out';
 
+open SAVEOUT, ">&STDOUT" or diag $!;
+close STDOUT;
 # line 100
 our $compilesub = B::Xref::compile("-o$file");
 ok( ref $compilesub eq 'CODE', "compile() returns a coderef ($compilesub)" );
 $compilesub->(); # Compile this test script
-
-#END { unlink $file or diag "END block failed: $!" }
+close STDOUT;
+open STDOUT, ">&SAVEOUT" or diag $!;
 
 # Now parse the output
 # line 200
@@ -94,7 +98,6 @@ is(
 );
 
 END {
-    close XREF;
     1 while unlink $file;
 }