database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-23 07:05:53 +03:00
Code

Bug #17926328 - MTR SHOULD NOT WAIT FOR CHILDREN WHEN ABORTING TEST RUN ON WINDOWS

Browse Source
This commit is contained in:
sayantan dutta 2014-02-25 18:42:14 +05:30
parent 42bfa90874
commit d18f67bbab
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/mysql-test-run.pl
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl #!/usr/bin/perl
# -*- cperl -*- # -*- cperl -*-
# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -474,15 +474,17 @@ sub main {
# Send Ctrl-C to any children still running # Send Ctrl-C to any children still running
kill("INT", keys(%children)); kill("INT", keys(%children));
# Wait for childs to exit if (!IS_WINDOWS) {
foreach my $pid (keys %children) # Wait for children to exit
{ foreach my $pid (keys %children)
my $ret_pid= waitpid($pid, 0); {
if ($ret_pid != $pid){ my $ret_pid= waitpid($pid, 0);
mtr_report("Unknown process $ret_pid exited"); if ($ret_pid != $pid){
} mtr_report("Unknown process $ret_pid exited");
else { }
delete $children{$ret_pid}; else {
delete $children{$ret_pid};
}
} }
} }