summaryrefslogtreecommitdiff
path: root/tests/libtest/lib503.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/lib503.c
parent78480892cdbbc67f419d0acfdf1865043bc31f62 (diff)
downloadcurl-fb48e2050b558c908c7740d1c4f20fd17fdf7fe6.tar.gz
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/lib503.c')
-rw-r--r--tests/libtest/lib503.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 25a641548..53f8f807b 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -103,18 +103,17 @@ 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;
- 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) {
+ done = TRUE;
+ break;
}
+
if (mp_timedout || done)
break;
@@ -140,7 +139,6 @@ int test(char *URL)
break;
}
- res = CURLM_CALL_MULTI_PERFORM;
}
if (ml_timedout || mp_timedout) {