percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-01-31 02:00:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in full_output

Browse Source
This commit is contained in:
Brian Fraser
2012-11-08 06:12:29 -03:00
parent 6d8d20faa1
commit 4d9805a004
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/PerconaTest.pm
View File

@@ -734,8 +734,9 @@ sub full_output {
or die "Cannot open file $file: $OS_ERROR";
*STDOUT->autoflush(1);
open *STDERR, '>', $file
or die "Cannot open file $file: $OS_ERROR";
my (undef, $file2) = tempfile();
open *STDERR, '>', $file2
or die "Cannot open file $file2: $OS_ERROR";
*STDERR->autoflush(1);
my $status;
@@ -760,7 +761,7 @@ sub full_output {
exit $code->();
}
close $_ or die "Cannot close $_: $OS_ERROR" for qw(STDOUT STDERR);
my $output = do { local $/; open my $fh, "<", $file or die $!; <$fh> };
my $output = slurp_file($file) . slurp_file($file2);
return ($output, $status);
}