From d7d0c9d9538df7f78b83cc91da8ec96c7d160f6a Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 26 Aug 2017 22:01:42 +0200 Subject: tests: Make sure libtests & unittests call curl_global_cleanup() These were missed in commit c468c27b. --- tests/libtest/lib1515.c | 1 + tests/libtest/mk-lib1521.pl | 2 ++ tests/unit/unit1302.c | 6 +++++- tests/unit/unit1303.c | 6 +++++- tests/unit/unit1396.c | 6 +++++- tests/unit/unit1600.c | 8 +++++++- tests/unit/unit1605.c | 17 +++++++++++------ tests/unit/unit1606.c | 22 +++++++++++----------- 8 files changed, 47 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c index c1499381a..4b41dc2e4 100644 --- a/tests/libtest/lib1515.c +++ b/tests/libtest/lib1515.c @@ -148,6 +148,7 @@ int test(char *URL) test_cleanup: curl_multi_cleanup(multi); + curl_global_cleanup(); return (int) res; } diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl index e60bce5cc..f5c68eb10 100644 --- a/tests/libtest/mk-lib1521.pl +++ b/tests/libtest/mk-lib1521.pl @@ -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; } diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c index 8dae5aad1..e6f94b24e 100644 --- a/tests/unit/unit1302.c +++ b/tests/unit/unit1302.c @@ -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 diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index 143ccd034..13fb0e05c 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -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 diff --git a/tests/unit/unit1396.c b/tests/unit/unit1396.c index f3275fdb6..9fba1f634 100644 --- a/tests/unit/unit1396.c +++ b/tests/unit/unit1396.c @@ -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 { diff --git a/tests/unit/unit1600.c b/tests/unit/unit1600.c index 11d718d35..190cf0f0a 100644 --- a/tests/unit/unit1600.c +++ b/tests/unit/unit1600.c @@ -28,13 +28,19 @@ static CURL *easy; static CURLcode unit_setup(void) { + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); easy = curl_easy_init(); - return easy ? CURLE_OK : CURLE_OUT_OF_MEMORY; + if(!easy) + return CURLE_OUT_OF_MEMORY; + return res; } static void unit_stop(void) { curl_easy_cleanup(easy); + curl_global_cleanup(); } UNITTEST_START diff --git a/tests/unit/unit1605.c b/tests/unit/unit1605.c index 2fe3a5aca..57a9199c5 100644 --- a/tests/unit/unit1605.c +++ b/tests/unit/unit1605.c @@ -23,21 +23,28 @@ #include "llist.h" +static CURL *easy; + static CURLcode unit_setup(void) { - return CURLE_OK; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + easy = curl_easy_init(); + if(!easy) + return CURLE_OUT_OF_MEMORY; + return res; } static void unit_stop(void) { - + curl_easy_cleanup(easy); + curl_global_cleanup(); } UNITTEST_START int len; char *esc; - CURL *easy = curl_easy_init(); - abort_unless(easy, "out of memory"); esc = curl_easy_escape(easy, "", -1); fail_unless(esc == NULL, "negative string length can't work"); @@ -45,6 +52,4 @@ UNITTEST_START esc = curl_easy_unescape(easy, "%41%41%41%41", -1, &len); fail_unless(esc == NULL, "negative string length can't work"); - curl_easy_cleanup(easy); - UNITTEST_STOP diff --git a/tests/unit/unit1606.c b/tests/unit/unit1606.c index eca8f3c38..df9c89ced 100644 --- a/tests/unit/unit1606.c +++ b/tests/unit/unit1606.c @@ -24,14 +24,23 @@ #include "speedcheck.h" #include "urldata.h" +static CURL *easy; + static CURLcode unit_setup(void) { - return CURLE_OK; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + easy = curl_easy_init(); + if(!easy) + return CURLE_OUT_OF_MEMORY; + return res; } static void unit_stop(void) { - + curl_easy_cleanup(easy); + curl_global_cleanup(); } static int runawhile(struct Curl_easy *easy, @@ -66,10 +75,6 @@ static int runawhile(struct Curl_easy *easy, } UNITTEST_START -{ - struct Curl_easy *easy = curl_easy_init(); - abort_unless(easy, "out of memory"); - fail_unless(runawhile(easy, 41, 41, 40, 0) == 41, "wrong low speed timeout"); fail_unless(runawhile(easy, 21, 21, 20, 0) == 21, @@ -82,9 +87,4 @@ UNITTEST_START "should not time out"); fail_unless(runawhile(easy, 10, 50, 100, 2) == 36, "bad timeout"); - - curl_easy_cleanup(easy); - - return 0; -} UNITTEST_STOP -- cgit v1.2.3