percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 02:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more test output broken by percona_test.load_data. Tweak ptc/t/privs.t so it passes on my box. Fix new start/stop scripts: don't check ibdata1 because SKIP_INNODB may be used. Make PerconaTest::output() cleaner.

Browse Source
This commit is contained in:
Daniel Nichter
2012-08-01 14:58:52 -06:00
parent ad46ec779e
commit cc3826f665
12 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/PerconaTest.pm
View File

@@ -150,32 +150,36 @@ sub output {
my ($file, $stderr, $die, $trf) = @args{qw(file stderr die trf)};
my $output = '';
if ( $file ) {
open *output_fh, '>', $file
or die "Cannot open file $file: $OS_ERROR";
}
else {
open *output_fh, '>', \$output
or die "Cannot capture output to variable: $OS_ERROR";
}
local *STDOUT = *output_fh;
{
if ( $file ) {
open *output_fh, '>', $file
or die "Cannot open file $file: $OS_ERROR";
}
else {
open *output_fh, '>', \$output
or die "Cannot capture output to variable: $OS_ERROR";
}
local *STDOUT = *output_fh;
# If capturing STDERR we must dynamically scope (local) STDERR
# in the outer scope of the sub. If we did,
# if ( $args{stderr} ) { local *STDERR; ... }
# then STDERR would revert to its original value outside the if
# block.
local *STDERR if $args{stderr}; # do in outer scope of this sub
*STDERR = *STDOUT if $args{stderr};
# If capturing STDERR we must dynamically scope (local) STDERR
# in the outer scope of the sub. If we did,
# if ( $args{stderr} ) { local *STDERR; ... }
# then STDERR would revert to its original value outside the if
# block.
local *STDERR if $args{stderr}; # do in outer scope of this sub
*STDERR = *STDOUT if $args{stderr};
eval { $code->() };
close *output_fh;
if ( $EVAL_ERROR ) {
die $EVAL_ERROR if $die;
warn $EVAL_ERROR unless $args{stderr};
return $EVAL_ERROR;
eval { $code->() };
if ( $EVAL_ERROR ) {
die $EVAL_ERROR if $die;
warn $EVAL_ERROR;
}
close *output_fh;
}
select STDOUT;
# Possible transform output before returning it. This doesn't work
# if output was captured to a file.
$output = $trf->($output) if $trf;