Commit d7d0c9d9 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

tests: Make sure libtests & unittests call curl_global_cleanup()

These were missed in commit c468c27b.
parent 09fc61e4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ int test(char *URL)
test_cleanup:

  curl_multi_cleanup(multi);
  curl_global_cleanup();

  return (int) res;
}
+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ int test(char *URL)
  struct curl_tlssessioninfo *tlssession;
  CURLcode res = CURLE_OK;
  (void)URL; /* not used */
  global_init(CURL_GLOBAL_ALL);
  easy_init(dep);
  easy_init(curl);
  share = curl_share_init();
@@ -296,6 +297,7 @@ test_cleanup:
  curl_easy_cleanup(curl);
  curl_easy_cleanup(dep);
  curl_share_cleanup(share);
  curl_global_cleanup();

  return (int)res;
}
+5 −1
Original line number Diff line number Diff line
@@ -30,15 +30,19 @@ static struct Curl_easy *data;

static CURLcode unit_setup(void)
{
  int res = CURLE_OK;

  global_init(CURL_GLOBAL_ALL);
  data = curl_easy_init();
  if(!data)
    return CURLE_OUT_OF_MEMORY;
  return CURLE_OK;
  return res;
}

static void unit_stop(void)
{
  curl_easy_cleanup(data);
  curl_global_cleanup();
}

UNITTEST_START
+5 −1
Original line number Diff line number Diff line
@@ -29,15 +29,19 @@ static struct Curl_easy *data;

static CURLcode unit_setup(void)
{
  int res = CURLE_OK;

  global_init(CURL_GLOBAL_ALL);
  data = curl_easy_init();
  if(!data)
    return CURLE_OUT_OF_MEMORY;
  return CURLE_OK;
  return res;
}

static void unit_stop(void)
{
  curl_easy_cleanup(data);
  curl_global_cleanup();
}

/* BASE is just a define to make us fool around with decently large number so
+5 −1
Original line number Diff line number Diff line
@@ -25,13 +25,17 @@ static CURL *hnd;

static CURLcode unit_setup(void)
{
  return CURLE_OK;
  int res = CURLE_OK;

  global_init(CURL_GLOBAL_ALL);
  return res;
}

static void unit_stop(void)
{
  if(hnd)
    curl_easy_cleanup(hnd);
  curl_global_cleanup();
}

struct test {
Loading