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

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.
parent 78480892

tests/libtest/lib503.c

+10 −12
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ int test(char *URL) 
    mp_timedout = FALSE;

    mp_start = tutil_tvnow();



    while (res == CURLM_CALL_MULTI_PERFORM) {

    res = (int)curl_multi_perform(m, &running);

    if (tutil_tvdiff(tutil_tvnow(), mp_start) >

        MULTI_PERFORM_HANG_TIMEOUT) {
@@ -114,7 +113,7 @@ int test(char *URL) 
      done = TRUE;

      break;

    }

    }



    if (mp_timedout || done)

      break;
@@ -140,7 +139,6 @@ int test(char *URL) 
      break;

    }



    res = CURLM_CALL_MULTI_PERFORM;

  }



  if (ml_timedout || mp_timedout) {

tests/libtest/lib504.c

+5 −9
Original line number Diff line number Diff line
@@ -106,16 +106,12 @@ int test(char *URL) 


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



    ret = CURLM_CALL_MULTI_PERFORM;



    while (ret == CURLM_CALL_MULTI_PERFORM) {

    ret = curl_multi_perform(m, &running);

    if (tutil_tvdiff(tutil_tvnow(), mp_start) >

        MULTI_PERFORM_HANG_TIMEOUT) {

      mp_timedout = TRUE;

      break;

    }

    }

    if (mp_timedout)

      break;

tests/libtest/lib507.c

+12 −18
Original line number Diff line number Diff line
@@ -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) {

      MULTI_PERFORM_HANG_TIMEOUT)

    mp_timedout = TRUE;

      break;

    }

  } while (ret == CURLM_CALL_MULTI_PERFORM);



  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) {

            MULTI_PERFORM_HANG_TIMEOUT)

          mp_timedout = TRUE;

        break;

    }

        } while (ret == CURLM_CALL_MULTI_PERFORM);

        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;

tests/libtest/lib525.c

+8 −12
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ int test(char *URL) 
    mp_timedout = FALSE;

    mp_start = tutil_tvnow();



    while (res == CURLM_CALL_MULTI_PERFORM) {

    res = (int)curl_multi_perform(m, &running);

    if (tutil_tvdiff(tutil_tvnow(), mp_start) >

        MULTI_PERFORM_HANG_TIMEOUT) {
@@ -162,9 +161,6 @@ int test(char *URL) 
      done = TRUE;

      break;

    }

    }

    if (mp_timedout || done)

      break;



    if (res != CURLM_OK) {

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

tests/libtest/lib526.c

+30 −35
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ int test(char *URL) 
    mp_timedout = FALSE;

    mp_start = tutil_tvnow();



    while (res == CURLM_CALL_MULTI_PERFORM) {

    res = (int)curl_multi_perform(m, &running);

    if (tutil_tvdiff(tutil_tvnow(), mp_start) >

        MULTI_PERFORM_HANG_TIMEOUT) {
@@ -186,13 +185,11 @@ int test(char *URL) 
          break;

        }

      }

        else

      else {

        done = TRUE; /* bail out */

        break;

      }

    }

    if (mp_timedout || done)

      break;



    if (res != CURLM_OK) {

      fprintf(stderr, "not okay???\n");
@@ -215,8 +212,6 @@ int test(char *URL) 
      res = 195;

      break;

    }



    res = CURLM_CALL_MULTI_PERFORM;

  }



  if (ml_timedout || mp_timedout) {