diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-06-26 23:12:08 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-06-27 16:01:41 +0200 |
| commit | fb48e2050b558c908c7740d1c4f20fd17fdf7fe6 (patch) | |
| tree | 9425a7c6a674d87bc58792f1a25169260968a0d6 /tests/libtest/lib507.c | |
| parent | 78480892cdbbc67f419d0acfdf1865043bc31f62 (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/lib507.c')
| -rw-r--r-- | tests/libtest/lib507.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index c5a009d8c..e4a1b241b 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -75,14 +75,10 @@ int test(char *URL) mp_timedout = FALSE; mp_start = tutil_tvnow(); - do { - ret = curl_multi_perform(multi, &still_running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > - MULTI_PERFORM_HANG_TIMEOUT) { - mp_timedout = TRUE; - break; - } - } while (ret == CURLM_CALL_MULTI_PERFORM); + ret = curl_multi_perform(multi, &still_running); + if (tutil_tvdiff(tutil_tvnow(), mp_start) > + MULTI_PERFORM_HANG_TIMEOUT) + mp_timedout = TRUE; ml_timedout = FALSE; ml_start = tutil_tvnow(); @@ -116,20 +112,18 @@ int test(char *URL) default: mp_timedout = FALSE; mp_start = tutil_tvnow(); - do { - ret = curl_multi_perform(multi, &still_running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > - MULTI_PERFORM_HANG_TIMEOUT) { - mp_timedout = TRUE; - break; - } - } while (ret == CURLM_CALL_MULTI_PERFORM); + ret = curl_multi_perform(multi, &still_running); + if (tutil_tvdiff(tutil_tvnow(), mp_start) > + MULTI_PERFORM_HANG_TIMEOUT) + mp_timedout = TRUE; break; } } if (ml_timedout || mp_timedout) { - if (ml_timedout) fprintf(stderr, "ml_timedout\n"); - if (mp_timedout) fprintf(stderr, "mp_timedout\n"); + if (ml_timedout) + fprintf(stderr, "ml_timedout\n"); + if (mp_timedout) + fprintf(stderr, "mp_timedout\n"); fprintf(stderr, "ABORTING TEST, since it seems " "that it would have run forever.\n"); i = TEST_ERR_RUNS_FOREVER; |