diff options
Diffstat (limited to 'tests/libtest/lib533.c')
| -rw-r--r-- | tests/libtest/lib533.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 74499c232..4403f75ff 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -24,6 +24,8 @@ int test(char *URL) char done=FALSE; CURLM *m; int current=0; + int loop1 = 40; + int loop2 = 20; /* In windows, this will init the winsock stuff */ curl_global_init(CURL_GLOBAL_ALL); @@ -44,15 +46,16 @@ int test(char *URL) fprintf(stderr, "Start at URL 0\n"); - while(!done) { + while ((--loop1>0) && (loop2>0) && (!done)) { fd_set rd, wr, exc; int max_fd; struct timeval interval; interval.tv_sec = 1; interval.tv_usec = 0; + loop2 = 20; - while (res == CURLM_CALL_MULTI_PERFORM) { + while ((--loop2>0) && (res == CURLM_CALL_MULTI_PERFORM)) { res = (int)curl_multi_perform(m, &running); if (running <= 0) { if(!current++) { @@ -80,7 +83,7 @@ int test(char *URL) break; } } - if(done) + if ((loop2 <= 0) || (done)) break; if (res != CURLM_OK) { @@ -108,6 +111,12 @@ int test(char *URL) res = CURLM_CALL_MULTI_PERFORM; } + if ((loop1 <= 0) || (loop2 <= 0)) { + fprintf(stderr, "ABORTING TEST, since it seems " + "that it would have run forever.\n"); + res = 77; + } + curl_easy_cleanup(curl); curl_multi_cleanup(m); |