Commit da0b3806 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

don't select() forever, set a timeout so at least the test fails nice

parent ed7ac3c9

tests/libtest/lib503.c

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ CURLcode test(char *URL) 
    while(!done) {

      fd_set rd, wr, exc;

      int max_fd;

      struct timeval interval={1,0};



      while (res == CURLM_CALL_MULTI_PERFORM) {

        res = curl_multi_perform(m, &running);
@@ -66,7 +67,7 @@ CURLcode test(char *URL) 
        return 89;

      }



      if (select(max_fd+1, &rd, &wr, &exc, NULL) == -1) {

      if (select(max_fd+1, &rd, &wr, &exc, &interval) == -1) {

        fprintf(stderr, "bad select??\n");

        return 95;

      }

tests/libtest/lib504.c

+14 −11
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ CURLcode test(char *URL) 
  CURLMcode res;

  int running;

  int max_fd;

  int rc;



  curl_global_init(CURL_GLOBAL_ALL);

  c = curl_easy_init();
@@ -38,6 +39,10 @@ CURLcode test(char *URL) 
  if(res && (res != CURLM_CALL_MULTI_PERFORM))

    return 1; /* major failure */

  do {

    struct timeval interval={1,0};



    fprintf(stderr, "curl_multi_perform()\n");

    

    do {

      res = curl_multi_perform(m, &running);

    } while (res == CURLM_CALL_MULTI_PERFORM);
@@ -45,17 +50,16 @@ CURLcode test(char *URL) 
      /* This is where this code is expected to reach */

      int numleft;

      CURLMsg *msg = curl_multi_info_read(m, &numleft);

      fprintf(stderr, "Not running\n");

      fprintf(stderr, "Expected: not running\n");

      if(msg && !numleft)

        ret = 100; /* this is where we should be */

      else

        ret = 99; /* not correct */

      break;

    }

	fprintf(stderr, "running %d res %d\n", running, res);

    fprintf(stderr, "running == %d, res == %d\n", running, res);



    if (res != CURLM_OK) {

      fprintf(stderr, "not okay???\n");

      ret = 2;

      break;

    }
@@ -65,17 +69,16 @@ CURLcode test(char *URL) 
    FD_ZERO(&exc);

    max_fd = 0;



	fprintf(stderr, "_fdset()\n");

    fprintf(stderr, "curl_multi_fdset()\n");

    if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {

      fprintf(stderr, "unexpected failured of fdset.\n");

      ret = 3;

      break;

    }

	fprintf(stderr, "select\n");

    select(max_fd+1, &rd, &wr, &exc, NULL);

    rc = select(max_fd+1, &rd, &wr, &exc, &interval);

    fprintf(stderr, "select returned %d\n", rc);

    

    fprintf(stderr, "loop!\n");

  } while(1);

  } while(rc);



  curl_multi_remove_handle(m, c);

  curl_easy_cleanup(c);