generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libtests: stop checking for CURLM_CALL_MULTI_PERFORM

Browse Source 
CURLM_CALL_MULTI_PERFORM stopped being a valid return code from
curl_multi_perform back in 7.20.0. All the libcurl tests are ajusted to
this and no longer check for this return code. Makes them simpler.
This commit is contained in:
Daniel Stenberg
2011-06-26 23:12:08 +02:00
parent 78480892cd
commit fb48e2050b
13 changed files with 118 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/libtest/lib564.c
View File

@@ -98,20 +98,16 @@ int test(char *URL)
mp_timedout = FALSE;
mp_start = tutil_tvnow();
while (res == CURLM_CALL_MULTI_PERFORM) {
res = (int)curl_multi_perform(m, &running);
if (tutil_tvdiff(tutil_tvnow(), mp_start) >
MULTI_PERFORM_HANG_TIMEOUT) {
mp_timedout = TRUE;
break;
}
if (running <= 0) {
done = TRUE; /* bail out */
break;
}
}
if (mp_timedout || done)
res = (int)curl_multi_perform(m, &running);
if (tutil_tvdiff(tutil_tvnow(), mp_start) >
MULTI_PERFORM_HANG_TIMEOUT) {
mp_timedout = TRUE;
break;
}
if (running <= 0) {
done = TRUE; /* bail out */
break;
}
if (res != CURLM_OK) {
fprintf(stderr, "not okay???\n");
@@ -134,8 +130,6 @@ int test(char *URL)
res = 195;
break;
}
res = CURLM_CALL_MULTI_PERFORM;
}
if (ml_timedout || mp_timedout) {