aboutsummaryrefslogtreecommitdiff
path: root/tests/libtest/lib533.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-06-26 23:12:08 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-06-27 16:01:41 +0200
commitfb48e2050b558c908c7740d1c4f20fd17fdf7fe6 (patch)
tree9425a7c6a674d87bc58792f1a25169260968a0d6 /tests/libtest/lib533.c
parent78480892cdbbc67f419d0acfdf1865043bc31f62 (diff)
libtests: stop checking for CURLM_CALL_MULTI_PERFORM
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.
Diffstat (limited to 'tests/libtest/lib533.c')
-rw-r--r--tests/libtest/lib533.c59
1 files changed, 28 insertions, 31 deletions
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index 606eba75c..5b6d8bf73 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -99,41 +99,38 @@ 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) {
- if(!current++) {
- fprintf(stderr, "Advancing to URL 1\n");
- /* remove the handle we use */
- curl_multi_remove_handle(m, curl);
-
- /* make us re-use the same handle all the time, and try resetting
- the handle first too */
- curl_easy_reset(curl);
- test_setopt(curl, CURLOPT_URL, libtest_arg2);
- test_setopt(curl, CURLOPT_VERBOSE, 1);
- test_setopt(curl, CURLOPT_FAILONERROR, 1);
-
- /* re-add it */
- res = (int)curl_multi_add_handle(m, curl);
- if(res) {
- fprintf(stderr, "add handle failed: %d.\n", res);
- res = 243;
- break;
- }
+ 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) {
+ if(!current++) {
+ fprintf(stderr, "Advancing to URL 1\n");
+ /* remove the handle we use */
+ curl_multi_remove_handle(m, curl);
+
+ /* make us re-use the same handle all the time, and try resetting
+ the handle first too */
+ curl_easy_reset(curl);
+ test_setopt(curl, CURLOPT_URL, libtest_arg2);
+ test_setopt(curl, CURLOPT_VERBOSE, 1);
+ test_setopt(curl, CURLOPT_FAILONERROR, 1);
+
+ /* re-add it */
+ res = (int)curl_multi_add_handle(m, curl);
+ if(res) {
+ fprintf(stderr, "add handle failed: %d.\n", res);
+ res = 243;
+ break;
}
- else
- done = TRUE; /* bail out */
+ }
+ else {
+ done = TRUE; /* bail out */
break;
}
}
- if (mp_timedout || done)
- break;
if (res != CURLM_OK) {
fprintf(stderr, "not okay???\n");