mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into mysql.com:/M50/mysql-5.0
This commit is contained in:
unknown 2005-09-14 15:24:52 +02:00
commit b0aa4c95b6
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/lib/mtr_process.pl
View file

@ -166,7 +166,7 @@ sub spawn_impl ($$$$$$$$) {
{
if ( ! open(STDOUT,$log_file_open_mode,$output) )
{
mtr_error("can't redirect STDOUT to \"$output\": $!");
mtr_child_error("can't redirect STDOUT to \"$output\": $!");
}
}
@ -176,14 +176,14 @@ sub spawn_impl ($$$$$$$$) {
{
if ( ! open(STDERR,">&STDOUT") )
{
mtr_error("can't dup STDOUT: $!");
mtr_child_error("can't dup STDOUT: $!");
}
}
else
{
if ( ! open(STDERR,$log_file_open_mode,$error) )
{
mtr_error("can't redirect STDERR to \"$error\": $!");
mtr_child_error("can't redirect STDERR to \"$error\": $!");
}
}
}
@ -192,13 +192,13 @@ sub spawn_impl ($$$$$$$$) {
{
if ( ! open(STDIN,"<",$input) )
{
mtr_error("can't redirect STDIN to \"$input\": $!");
mtr_child_error("can't redirect STDIN to \"$input\": $!");
}
}
if ( ! exec($path,@$arg_list_t) )
{
mtr_error("failed to execute \"$path\": $!");
mtr_child_error("failed to execute \"$path\": $!");
}
}
}

12
mysql-test/lib/mtr_report.pl
View file

@ -19,6 +19,7 @@ sub mtr_print_header ();
sub mtr_report (@);
sub mtr_warning (@);
sub mtr_error (@);
sub mtr_child_error (@);
sub mtr_debug (@);
@ -74,7 +75,7 @@ sub mtr_show_failed_diff ($) {
sub mtr_report_test_name ($) {
my $tinfo= shift;
printf "%-31s ", $tinfo->{'name'};
printf "%-30s ", $tinfo->{'name'};
}
sub mtr_report_test_skipped ($) {
@ -122,13 +123,13 @@ sub mtr_report_test_failed ($) {
# we should write out into $::path_timefile when the error occurs.
if ( -f $::path_timefile )
{
print "Errors are (from $::path_timefile) :\n";
print "\nErrors are (from $::path_timefile) :\n";
print mtr_fromfile($::path_timefile); # FIXME print_file() instead
print "\n(the last lines may be the most important ones)\n";
}
else
{
print "Unexpected termination, probably when starting mysqld\n";
print "\nUnexpected termination, probably when starting mysqld\n";
}
}
@ -286,6 +287,11 @@ sub mtr_error (@) {
mtr_exit(1);
}
sub mtr_child_error (@) {
print STDERR "mysql-test-run: *** ERROR(child): ",join(" ", @_),"\n";
exit(1);
}
sub mtr_debug (@) {
if ( $::opt_script_debug )
{