Start testing --save-results. Let $cmd be a file in PerconaTest.pm. Remove 'at ... line N' from EventExecutor.pm errors.

This commit is contained in:
Daniel Nichter
2013-02-20 08:27:49 -07:00
parent 4cb51140f1
commit e62a02e0d3
11 changed files with 182 additions and 14 deletions

View File

@@ -561,8 +561,13 @@ sub no_diff {
die "I need a cmd argument" unless $cmd;
die "I need an expected_output argument" unless $expected_output;
die "$expected_output does not exist" unless -f "$trunk/$expected_output";
$expected_output = "$trunk/$expected_output";
if ( $args{full_path} ) {
die "$expected_output does not exist" unless -f $expected_output;
}
else {
die "$expected_output does not exist" unless -f "$trunk/$expected_output";
$expected_output = "$trunk/$expected_output";
}
my $tmp_file = '/tmp/percona-toolkit-test-output.txt';
my $tmp_file_orig = '/tmp/percona-toolkit-test-output-original.txt';
@@ -582,6 +587,9 @@ sub no_diff {
print $tmp_fh $cmd;
close $tmp_fh;
}
elsif ( -f $cmd ) {
`cp $cmd $tmp_file`;
}
else {
`$cmd > $tmp_file`;
}