moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Slack time reduction

This commit is contained in:
Yang Tse 2009-12-19 13:20:07 +00:00
parent aeec8e0b38
commit 010fe5acd5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/ftp.pm
View File

@ -120,8 +120,8 @@ sub killpid {
# Allow all signalled processes five seconds to gracefully die. # Allow all signalled processes five seconds to gracefully die.
if(defined(@signalled)) { if(defined(@signalled)) {
my $eighths = 40; my $twentieths = 5 * 20;
while($eighths--) { while($twentieths--) {
for(my $i = scalar(@signalled) - 1; $i >= 0; $i--) { for(my $i = scalar(@signalled) - 1; $i >= 0; $i--) {
my $pid = $signalled[$i]; my $pid = $signalled[$i];
if(!kill(0, $pid)) { if(!kill(0, $pid)) {
@ -132,7 +132,7 @@ sub killpid {
} }
} }
last if(not scalar(@signalled)); last if(not scalar(@signalled));
select(undef, undef, undef, 0.125); select(undef, undef, undef, 0.05);
} }
} }

12
tests/runtests.pl
View File

@ -2251,9 +2251,9 @@ sub singletest {
# of time until the server removes it, or the given time expires. # of time until the server removes it, or the given time expires.
if($serverlogslocktimeout) { if($serverlogslocktimeout) {
my $lockretry = $serverlogslocktimeout * 8; my $lockretry = $serverlogslocktimeout * 20;
while((-f $SERVERLOGS_LOCK) && $lockretry--) { while((-f $SERVERLOGS_LOCK) && $lockretry--) {
select(undef, undef, undef, 0.125); select(undef, undef, undef, 0.05);
} }
if(($lockretry < 0) && if(($lockretry < 0) &&
($serverlogslocktimeout >= $defserverlogslocktimeout)) { ($serverlogslocktimeout >= $defserverlogslocktimeout)) {
@ -3421,7 +3421,7 @@ if($timestats) {
logmsg "$txt\n"; logmsg "$txt\n";
} }
$counter = 25; $counter = 10;
logmsg "\nTest definition reading and preparation time per test ". logmsg "\nTest definition reading and preparation time per test ".
sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full");
logmsg "-time- test\n"; logmsg "-time- test\n";
@ -3441,7 +3441,7 @@ if($timestats) {
logmsg "$txt\n"; logmsg "$txt\n";
} }
$counter = 25; $counter = 15;
logmsg "\nTest server logs lock removal time per test ". logmsg "\nTest server logs lock removal time per test ".
sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full");
logmsg "-time- test\n"; logmsg "-time- test\n";
@ -3451,7 +3451,7 @@ if($timestats) {
logmsg "$txt\n"; logmsg "$txt\n";
} }
$counter = 25; $counter = 10;
logmsg "\nTest results verification time per test ". logmsg "\nTest results verification time per test ".
sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full");
logmsg "-time- test\n"; logmsg "-time- test\n";
@ -3462,7 +3462,7 @@ if($timestats) {
} }
$counter = 50; $counter = 50;
logmsg "\nAggregated time per test ". logmsg "\nTotal time per test ".
sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full"); sprintf("(%s)...\n\n", (not $fullstats)?"top $counter":"full");
logmsg "-time- test\n"; logmsg "-time- test\n";
logmsg "------ ----\n"; logmsg "------ ----\n";