1 files changed, 34 insertions, 133 deletions

diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index 03c4a62fa..ad84ff8a5 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -25,8 +25,7 @@
 #include "warnless.h"
 #include "memdebug.h"
 
-#define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
-#define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
+#define TEST_HANG_TIMEOUT 60 * 1000
 
 #define NUM_HANDLES 4
 
@@ -35,169 +34,71 @@ int test(char *URL)
   int res = 0;
   CURL *curl[NUM_HANDLES];
   int running;
-  char done=FALSE;
-  CURLM *m;
-  int i, j;
-  struct timeval ml_start;
-  struct timeval mp_start;
-  char ml_timedout = FALSE;
-  char mp_timedout = FALSE;
+  CURLM *m = NULL;
+  int i;
   char target_url[256];
 
-  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
-    fprintf(stderr, "curl_global_init() failed\n");
-    return TEST_ERR_MAJOR_BAD;
-  }
+  for(i=0; i < NUM_HANDLES; i++)
+    curl[i] = NULL;
 
-  if ((m = curl_multi_init()) == NULL) {
-    fprintf(stderr, "curl_multi_init() failed\n");
-    curl_global_cleanup();
-    return TEST_ERR_MAJOR_BAD;
-  }
+  start_test_timing();
+
+  global_init(CURL_GLOBAL_ALL);
+
+  multi_init(m);
 
   /* get NUM_HANDLES easy handles */
   for(i=0; i < NUM_HANDLES; i++) {
-    curl[i] = curl_easy_init();
-    if(!curl[i]) {
-      fprintf(stderr, "curl_easy_init() failed "
-              "on handle #%d\n", i);
-      for (j=i-1; j >= 0; j--) {
-        curl_multi_remove_handle(m, curl[j]);
-        curl_easy_cleanup(curl[j]);
-      }
-      curl_multi_cleanup(m);
-      curl_global_cleanup();
-      return TEST_ERR_MAJOR_BAD + i;
-    }
+    /* get an easy handle */
+    easy_init(curl[i]);
+    /* specify target */
     sprintf(target_url, "%s%04i", URL, i + 1);
     target_url[sizeof(target_url) - 1] = '\0';
-
-    res = curl_easy_setopt(curl[i], CURLOPT_URL, target_url);
-    if(res) {
-      fprintf(stderr, "curl_easy_setopt() failed "
-              "on handle #%d\n", i);
-      for (j=i; j >= 0; j--) {
-        curl_multi_remove_handle(m, curl[j]);
-        curl_easy_cleanup(curl[j]);
-      }
-      curl_multi_cleanup(m);
-      curl_global_cleanup();
-      return TEST_ERR_MAJOR_BAD + i;
-    }
-
+    easy_setopt(curl[i], CURLOPT_URL, target_url);
     /* go verbose */
-    res = curl_easy_setopt(curl[i], CURLOPT_VERBOSE, 1L);
-    if(res) {
-      fprintf(stderr, "curl_easy_setopt() failed "
-              "on handle #%d\n", i);
-      for (j=i; j >= 0; j--) {
-        curl_multi_remove_handle(m, curl[j]);
-        curl_easy_cleanup(curl[j]);
-      }
-      curl_multi_cleanup(m);
-      curl_global_cleanup();
-      return TEST_ERR_MAJOR_BAD + i;
-    }
-
+    easy_setopt(curl[i], CURLOPT_VERBOSE, 1L);
     /* include headers */
-    res = curl_easy_setopt(curl[i], CURLOPT_HEADER, 1L);
-    if(res) {
-      fprintf(stderr, "curl_easy_setopt() failed "
-              "on handle #%d\n", i);
-      for (j=i; j >= 0; j--) {
-        curl_multi_remove_handle(m, curl[j]);
-        curl_easy_cleanup(curl[j]);
-      }
-      curl_multi_cleanup(m);
-      curl_global_cleanup();
-      return TEST_ERR_MAJOR_BAD + i;
-    }
-
+    easy_setopt(curl[i], CURLOPT_HEADER, 1L);
     /* add handle to multi */
-    if ((res = (int)curl_multi_add_handle(m, curl[i])) != CURLM_OK) {
-      fprintf(stderr, "curl_multi_add_handle() failed, "
-              "on handle #%d with code %d\n", i, res);
-      curl_easy_cleanup(curl[i]);
-      for (j=i-1; j >= 0; j--) {
-        curl_multi_remove_handle(m, curl[j]);
-        curl_easy_cleanup(curl[j]);
-      }
-      curl_multi_cleanup(m);
-      curl_global_cleanup();
-      return TEST_ERR_MAJOR_BAD + i;
-    }
+    multi_add_handle(m, curl[i]);
   }
 
-  curl_multi_setopt(m, CURLMOPT_PIPELINING, 1L);
-
-  ml_timedout = FALSE;
-  ml_start = tutil_tvnow();
+  multi_setopt(m, CURLMOPT_PIPELINING, 1L);
 
   fprintf(stderr, "Start at URL 0\n");
 
-  while (!done) {
-    fd_set rd, wr, exc;
-    int max_fd;
+  for(;;) {
     struct timeval interval;
+    fd_set rd, wr, exc;
+    int maxfd = -99;
 
     interval.tv_sec = 1;
     interval.tv_usec = 0;
 
-    if (tutil_tvdiff(tutil_tvnow(), ml_start) >
-        MAIN_LOOP_HANG_TIMEOUT) {
-      ml_timedout = TRUE;
-      break;
-    }
-    mp_timedout = FALSE;
-    mp_start = tutil_tvnow();
-
-    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");
-      break;
-    }
+    multi_perform(m, &running);
+
+    abort_on_test_timeout();
+
+    if(!running)
+      break; /* done */
 
     FD_ZERO(&rd);
     FD_ZERO(&wr);
     FD_ZERO(&exc);
-    max_fd = 0;
 
-    if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {
-      fprintf(stderr, "unexpected failured of fdset.\n");
-      res = 189;
-      break;
-    }
+    multi_fdset(m, &rd, &wr, &exc, &maxfd);
 
-    if (select_test(max_fd+1, &rd, &wr, &exc, &interval) == -1) {
-      fprintf(stderr, "bad select??\n");
-      res = 195;
-      break;
-    }
+    /* At this point, maxfd is guaranteed to be greater or equal than -1. */
 
-    res = CURLM_CALL_MULTI_PERFORM;
-  }
+    select_test(maxfd+1, &rd, &wr, &exc, &interval);
 
-  if (ml_timedout || mp_timedout) {
-    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");
-    res = TEST_ERR_RUNS_FOREVER;
+    abort_on_test_timeout();
   }
 
-/* test_cleanup: */
+test_cleanup:
+
+  /* proper cleanup sequence - type PB */
 
-  /* cleanup NUM_HANDLES easy handles */
   for(i=0; i < NUM_HANDLES; i++) {
     curl_multi_remove_handle(m, curl[i]);
     curl_easy_cleanup(curl[i]);