From 8d00c4f7785900821627bb2e287552d6e6383469 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Wed, 5 Oct 2022 12:58:53 +0300 Subject: testcurl/https: enable verbose libcurl on debug builds --- src/testcurl/https/test_empty_response.c | 3 +++ src/testcurl/https/test_https_get.c | 3 +++ src/testcurl/https/test_https_get_iovec.c | 3 +++ src/testcurl/https/test_https_get_select.c | 3 +++ src/testcurl/https/test_https_session_info.c | 2 +- src/testcurl/https/test_https_sni.c | 2 +- src/testcurl/https/tls_test_common.c | 6 +++--- src/testcurl/https/tls_test_common.h | 4 ---- 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c index 92dbaec7..932a51bc 100644 --- a/src/testcurl/https/test_empty_response.c +++ b/src/testcurl/https/test_empty_response.c @@ -106,6 +106,9 @@ testInternalSelectGet (void) } c = curl_easy_init (); +#ifdef _DEBUG + curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); +#endif curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/hello_world"); curl_easy_setopt (c, CURLOPT_PORT, (long) port); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c index 7eebfd4c..a0cdb82f 100644 --- a/src/testcurl/https/test_https_get.c +++ b/src/testcurl/https/test_https_get.c @@ -193,6 +193,9 @@ testEmptyGet (unsigned int poll_flag) global_port = dinfo->port; } c = curl_easy_init (); +#ifdef _DEBUG + curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); +#endif curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/"); curl_easy_setopt (c, CURLOPT_PORT, (long) global_port); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c index c5ff7cb4..90ed5a07 100644 --- a/src/testcurl/https/test_https_get_iovec.c +++ b/src/testcurl/https/test_https_get_iovec.c @@ -351,6 +351,9 @@ testEmptyGet (unsigned int poll_flag) global_port = dinfo->port; } c = curl_easy_init (); +#ifdef _DEBUG + curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); +#endif curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/"); curl_easy_setopt (c, CURLOPT_PORT, (long) global_port); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c index 13145390..9ab7e892 100644 --- a/src/testcurl/https/test_https_get_select.c +++ b/src/testcurl/https/test_https_get_select.c @@ -122,6 +122,9 @@ testExternalGet (unsigned int flags) } c = curl_easy_init (); +#ifdef _DEBUG + curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); +#endif curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1/hello_world"); curl_easy_setopt (c, CURLOPT_PORT, (long) port); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c index 8d74feb2..c1bb31ef 100644 --- a/src/testcurl/https/test_https_session_info.c +++ b/src/testcurl/https/test_https_session_info.c @@ -145,7 +145,7 @@ test_query_session (void) sizeof (url), port); c = curl_easy_init (); -#if DEBUG_HTTPS_TEST +#ifdef _DEBUG curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); #endif curl_easy_setopt (c, CURLOPT_URL, url); diff --git a/src/testcurl/https/test_https_sni.c b/src/testcurl/https/test_https_sni.c index 0bde8adb..5059998e 100644 --- a/src/testcurl/https/test_https_sni.c +++ b/src/testcurl/https/test_https_sni.c @@ -199,7 +199,7 @@ do_get (const char *url, uint16_t port) cbc.pos = 0; c = curl_easy_init (); -#if DEBUG_HTTPS_TEST +#ifdef _DEBUG curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); #endif curl_easy_setopt (c, CURLOPT_URL, url); diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c index 51d20cce..b44ded1e 100644 --- a/src/testcurl/https/tls_test_common.c +++ b/src/testcurl/https/tls_test_common.c @@ -60,7 +60,7 @@ test_daemon_get (void *cls, port); c = curl_easy_init (); -#if DEBUG_HTTPS_TEST +#ifdef _DEBUG curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); #endif if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_URL, url))) || @@ -247,8 +247,8 @@ send_curl_req (char *url, CURLcode errornum; CURLcode e; c = curl_easy_init (); -#if DEBUG_HTTPS_TEST - curl_easy_setopt (c, CURLOPT_VERBOSE, CURL_VERBOS_LEVEL); +#ifdef _DEBUG + curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); #endif if ((CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_URL, url))) || (CURLE_OK != (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION, diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h index e6a61485..5192b774 100644 --- a/src/testcurl/https/tls_test_common.h +++ b/src/testcurl/https/tls_test_common.h @@ -28,10 +28,6 @@ #include #include -/* this enables verbos CURL version checking */ -#define DEBUG_HTTPS_TEST 0 -#define CURL_VERBOS_LEVEL 0 - #define test_data "Hello World\n" #define ca_cert_file_name SRCDIR "/test-ca.crt" -- cgit v1.2.3