Make testsuite parallel build compatible (part 2)

This commit is contained in:
Evgeny Grin (Karlson2k)
2017-06-25 20:33:19 +03:00
parent a7b7a32ec6
commit 9d1596d310
15 changed files with 271 additions and 79 deletions
+17 -2
View File
@@ -97,24 +97,39 @@ testExternalGet (int flags)
time_t start;
struct timeval tv;
const char *aes256_sha = "AES256-SHA";
int port;
if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
port = 0;
else
port = 3030;
multi = NULL;
cbc.buf = buf;
cbc.size = 2048;
cbc.pos = 0;
d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags,
1082, NULL, NULL, &ahc_echo, "GET",
port, NULL, NULL, &ahc_echo, "GET",
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
if (d == NULL)
return 256;
if (0 == port)
{
const union MHD_DaemonInfo *dinfo;
dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT);
if (NULL == dinfo || 0 == dinfo->port)
{ MHD_stop_daemon (d); return 32; }
port = (int)dinfo->port;
}
if (curl_uses_nss_ssl() == 0)
aes256_sha = "rsa_aes_256_sha";
c = curl_easy_init ();
curl_easy_setopt (c, CURLOPT_URL, "https://127.0.0.1:1082/hello_world");
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, &copyBuffer);
curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
/* TLS options */