diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-06-16 00:41:21 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-06-16 00:42:44 +0300 |
commit | e8d937beb5e0bf118c381846f2392cab973a2528 (patch) | |
tree | a7bec6dece0675986811e967d7e9756cc19e415a /src/testcurl/test_callback.c | |
parent | 36bf651023e2f810bd2ae4aa1ab2354338b9f00c (diff) | |
download | libmicrohttpd-e8d937beb5e0bf118c381846f2392cab973a2528.tar.gz libmicrohttpd-e8d937beb5e0bf118c381846f2392cab973a2528.zip |
Make testsuite parallel build compatible (part 1)
Diffstat (limited to 'src/testcurl/test_callback.c')
-rw-r--r-- | src/testcurl/test_callback.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c index 4af997d3..6901be0f 100644 --- a/src/testcurl/test_callback.c +++ b/src/testcurl/test_callback.c | |||
@@ -111,16 +111,33 @@ main(int argc, char **argv) | |||
111 | int running; | 111 | int running; |
112 | struct timeval tv; | 112 | struct timeval tv; |
113 | int extra; | 113 | int extra; |
114 | int port; | ||
115 | |||
116 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | ||
117 | port = 0; | ||
118 | else | ||
119 | port = 1140; | ||
114 | 120 | ||
115 | d = MHD_start_daemon(0, | 121 | d = MHD_start_daemon(0, |
116 | 8000, | 122 | port, |
117 | NULL, | 123 | NULL, |
118 | NULL, | 124 | NULL, |
119 | &callback, | 125 | &callback, |
120 | NULL, | 126 | NULL, |
121 | MHD_OPTION_END); | 127 | MHD_OPTION_END); |
128 | if (d == NULL) | ||
129 | return 32; | ||
130 | if (0 == port) | ||
131 | { | ||
132 | const union MHD_DaemonInfo *dinfo; | ||
133 | dinfo = MHD_get_daemon_info (d, MHD_DAEMON_INFO_BIND_PORT); | ||
134 | if (NULL == dinfo || 0 == dinfo->port) | ||
135 | { MHD_stop_daemon (d); return 48; } | ||
136 | port = (int)dinfo->port; | ||
137 | } | ||
122 | c = curl_easy_init (); | 138 | c = curl_easy_init (); |
123 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:8000/"); | 139 | curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1/"); |
140 | curl_easy_setopt (c, CURLOPT_PORT, (long)port); | ||
124 | curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &discard_buffer); | 141 | curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, &discard_buffer); |
125 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); | 142 | curl_easy_setopt (c, CURLOPT_FAILONERROR, 1); |
126 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); | 143 | curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); |