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

Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).

Browse source 
mysql-test/lib/mtr_process.pl:
  Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
  New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
  Expected to avoid HUP signals.
This commit is contained in:
unknown 2005-09-14 13:55:53 +02:00
parent a5903ed9f3
commit abd4974fd5
2 changed files with 11 additions and 5 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) ) 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") ) if ( ! open(STDERR,">&STDOUT") )
{ {
mtr_error("can't dup STDOUT: $!"); mtr_child_error("can't dup STDOUT: $!");
} }
} }
else else
{ {
if ( ! open(STDERR,$log_file_open_mode,$error) ) 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) ) 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) ) if ( ! exec($path,@$arg_list_t) )
{ {
mtr_error("failed to execute \"$path\": $!"); mtr_child_error("failed to execute \"$path\": $!");
} }
} }
} }

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

@ -19,6 +19,7 @@ sub mtr_print_header ();
sub mtr_report (@); sub mtr_report (@);
sub mtr_warning (@); sub mtr_warning (@);
sub mtr_error (@); sub mtr_error (@);
sub mtr_child_error (@);
sub mtr_debug (@); sub mtr_debug (@);
@ -286,6 +287,11 @@ sub mtr_error (@) {
mtr_exit(1); mtr_exit(1);
} }
sub mtr_child_error (@) {
print STDERR "mysql-test-run: *** ERROR(child): ",join(" ", @_),"\n";
exit(1);
}
sub mtr_debug (@) { sub mtr_debug (@) {
if ( $::opt_script_debug ) if ( $::opt_script_debug )
{ {