romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 08:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

improve synchronization between test harness runtests.pl script

Browse source 
and test harness servers to minimize risk of false test failures.

http://curl.haxx.se/mail/lib-2008-04/0392.html
This commit is contained in:
Yang Tse 2008-04-23 23:55:34 +00:00
parent 3783b455c0
commit 96edebf4d9
7 changed files with 132 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/server/tftpd.c
View file

@ -415,6 +415,7 @@ int main(int argc, char **argv)
int flag;
int rc;
struct testcase test;
int result = 0;
while(argc>arg) {
if(!strcmp("--version", argv[arg])) {
@ -518,20 +519,25 @@ int main(int argc, char **argv)
(struct sockaddr *)&from, &fromlen);
if (n < 0) {
logmsg("recvfrom:\n");
return 3;
result = 3;
break;
}
set_advisor_read_lock(SERVERLOGS_LOCK);
from.sin_family = AF_INET;
peer = socket(AF_INET, SOCK_DGRAM, 0);
if (peer < 0) {
logmsg("socket:\n");
return 2;
result = 2;
break;
}
if (connect(peer, (struct sockaddr *)&from, sizeof(from)) < 0) {
logmsg("connect: fail\n");
return 1;
result = 1;
break;
}
maxtimeout = 5*TIMEOUT;
@ -545,8 +551,14 @@ int main(int argc, char **argv)
free(test.buffer);
}
sclose(peer);
clear_advisor_read_lock(SERVERLOGS_LOCK);
} while(1);
return 0;
clear_advisor_read_lock(SERVERLOGS_LOCK);
return result;
}
struct formats {
@ -734,8 +746,10 @@ static void timer(int signum)
logmsg("alarm!");
timeout += rexmtval;
if (timeout >= maxtimeout)
if(timeout >= maxtimeout) {
clear_advisor_read_lock(SERVERLOGS_LOCK);
exit(1);
}
#ifdef HAVE_SIGSETJMP
siglongjmp(timeoutbuf, 1);
#endif