diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-10-10 19:41:27 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-10-13 09:06:46 +0300 |
commit | 094e2bbedd64cad4f112a780d3775ed352498b24 (patch) | |
tree | 361489d26455293562fd58f9eb0ffc61abb3917c | |
parent | 4ccbeb54f9df34c7b844b5c1e562181786c9a916 (diff) | |
download | libmicrohttpd-094e2bbedd64cad4f112a780d3775ed352498b24.tar.gz libmicrohttpd-094e2bbedd64cad4f112a780d3775ed352498b24.zip |
testcurl/https: enabled parallel make
All blocking issues should be fixed now.
-rw-r--r-- | src/testcurl/https/Makefile.am | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_iovec.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_sni.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_authentication.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_options.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am index 6b9962b3..77f80017 100644 --- a/src/testcurl/https/Makefile.am +++ b/src/testcurl/https/Makefile.am | |||
@@ -3,7 +3,7 @@ EMPTY_ITEM = | |||
3 | 3 | ||
4 | SUBDIRS = . | 4 | SUBDIRS = . |
5 | 5 | ||
6 | .NOTPARALLEL: | 6 | @HEAVY_TESTS_NOTPARALLEL@ |
7 | 7 | ||
8 | AM_CPPFLAGS = \ | 8 | AM_CPPFLAGS = \ |
9 | -I$(top_srcdir)/src/include \ | 9 | -I$(top_srcdir)/src/include \ |
diff --git a/src/testcurl/https/test_https_get_iovec.c b/src/testcurl/https/test_https_get_iovec.c index 0df4bf65..326dd8da 100644 --- a/src/testcurl/https/test_https_get_iovec.c +++ b/src/testcurl/https/test_https_get_iovec.c | |||
@@ -201,7 +201,7 @@ test_secure_get (FILE *test_fd, | |||
201 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 201 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
202 | port = 0; | 202 | port = 0; |
203 | else | 203 | else |
204 | port = 3041; | 204 | port = 3045; |
205 | 205 | ||
206 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | 206 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
207 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 207 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
diff --git a/src/testcurl/https/test_https_sni.c b/src/testcurl/https/test_https_sni.c index 573bf637..c4e94007 100644 --- a/src/testcurl/https/test_https_sni.c +++ b/src/testcurl/https/test_https_sni.c | |||
@@ -264,7 +264,7 @@ main (int argc, char *const *argv) | |||
264 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 264 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
265 | port = 0; | 265 | port = 0; |
266 | else | 266 | else |
267 | port = 3060; | 267 | port = 3065; |
268 | 268 | ||
269 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT | 269 | #ifdef MHD_HTTPS_REQUIRE_GCRYPT |
270 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); | 270 | gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0); |
diff --git a/src/testcurl/https/test_tls_authentication.c b/src/testcurl/https/test_tls_authentication.c index 5637eaaf..56b61c99 100644 --- a/src/testcurl/https/test_tls_authentication.c +++ b/src/testcurl/https/test_tls_authentication.c | |||
@@ -50,7 +50,7 @@ test_secure_get (void *cls, const char *cipher_suite, int proto_version) | |||
50 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 50 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
51 | port = 0; | 51 | port = 0; |
52 | else | 52 | else |
53 | port = 3070; | 53 | port = 3075; |
54 | 54 | ||
55 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | 55 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION |
56 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS | 56 | | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS |
diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c index dfd7aad4..09e0c9c9 100644 --- a/src/testcurl/https/test_tls_options.c +++ b/src/testcurl/https/test_tls_options.c | |||
@@ -267,7 +267,7 @@ test_first_supported_versions (void) | |||
267 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 267 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
268 | port = 0; /* Use system automatic assignment */ | 268 | port = 0; /* Use system automatic assignment */ |
269 | else | 269 | else |
270 | port = 3060; /* Use predefined port, may break parallel testing of another MHD build */ | 270 | port = 3080; /* Use predefined port, may break parallel testing of another MHD build */ |
271 | 271 | ||
272 | vers_list = gnutls_protocol_list (); | 272 | vers_list = gnutls_protocol_list (); |
273 | if (NULL == vers_list) | 273 | if (NULL == vers_list) |