diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-05 11:12:00 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-03-05 08:15:05 +0100 |
| commit | 4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142 (patch) | |
| tree | aa6baf7a064686ad1854c3265c622ff9e618c9c6 | |
| parent | ebe8aa9cc18afa5027b1afd7b6e086613268c083 (diff) | |
| download | samba-4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142.tar.gz samba-4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142.tar.bz2 samba-4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142.zip | |
selftest: Reduce time in cleanup loop, try waitpid on all 3 children
| -rwxr-xr-x | selftest/target/Samba3.pm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 87763aadec..797ae715bb 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -54,9 +54,12 @@ sub teardown_env($$) # This should give it time to write out the gcov data until ($count > 20) { - if (Samba::cleanup_child($smbdpid, "smbd") == -1 - && Samba::cleanup_child($nmbdpid, "nmbd") == -1 - && Samba::cleanup_child($winbinddpid, "winbindd") == -1) { + my $smbdchild = Samba::cleanup_child($smbdpid, "smbd"); + my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd"); + my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd"); + if ($smbdchild == -1 + && $nmbdchild == -1 + && $winbinddchild == -1) { last; } sleep(1); @@ -73,9 +76,12 @@ sub teardown_env($$) $count = 0; until ($count > 10) { - if (Samba::cleanup_child($smbdpid, "smbd") == -1 - && Samba::cleanup_child($nmbdpid, "nmbd") == -1 - && Samba::cleanup_child($winbinddpid, "winbindd") == -1) { + my $smbdchild = Samba::cleanup_child($smbdpid, "smbd"); + my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd"); + my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd"); + if ($smbdchild == -1 + && $nmbdchild == -1 + && $winbinddchild == -1) { last; } sleep(1); |