Unverified Commit 96d6d380 authored by Rikard Falkeborn's avatar Rikard Falkeborn Committed by Daniel Stenberg
Browse files

test1531: Add timeout

Previously, the macro TEST_HANG_TIMEOUT was unused, but since there is
looping going on, we might as well add timing instead of removing it.

Closes #2853
parent 8ea0baed
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ int test(char *URL)
  int msgs_left; /* how many messages are left */
  int res = CURLE_OK;

  start_test_timing();

  global_init(CURL_GLOBAL_ALL);

  /* Allocate one CURL handle per transfer */
@@ -59,6 +61,8 @@ int test(char *URL)
  /* we start some action by calling perform right away */
  curl_multi_perform(multi_handle, &still_running);

  abort_on_test_timeout();

  do {
    struct timeval timeout;
    int rc; /* select() return code */
@@ -127,6 +131,8 @@ int test(char *URL)
      curl_multi_perform(multi_handle, &still_running);
      break;
    }

    abort_on_test_timeout();
  } while(still_running);

  /* See how the transfers went */
@@ -136,14 +142,17 @@ int test(char *URL)
      printf("HTTP transfer completed with status %d\n", msg->data.result);
      break;
    }

    abort_on_test_timeout();
  } while(msg);

test_cleanup:
  curl_multi_cleanup(multi_handle);

  /* Free the CURL handles */
  curl_easy_cleanup(easy);
  curl_global_cleanup();

  return 0;
  return res;
}