diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-06-25 20:33:19 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-06-25 20:33:19 +0300 |
commit | 9d1596d3108ff237dbe368942296a0f6fbba47f8 (patch) | |
tree | bb6ac83244c81ce1e4063cbe4c35b15d13e01b39 /src/testcurl/https/tls_test_common.h | |
parent | a7b7a32ec6dd493e00573da4b2f343f02feb0aa7 (diff) | |
download | libmicrohttpd-9d1596d3108ff237dbe368942296a0f6fbba47f8.tar.gz libmicrohttpd-9d1596d3108ff237dbe368942296a0f6fbba47f8.zip |
Make testsuite parallel build compatible (part 2)
Diffstat (limited to 'src/testcurl/https/tls_test_common.h')
-rw-r--r-- | src/testcurl/https/tls_test_common.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h index 1d324760..a59c43f4 100644 --- a/src/testcurl/https/tls_test_common.h +++ b/src/testcurl/https/tls_test_common.h | |||
@@ -32,8 +32,6 @@ | |||
32 | #define DEBUG_HTTPS_TEST 0 | 32 | #define DEBUG_HTTPS_TEST 0 |
33 | #define CURL_VERBOS_LEVEL 0 | 33 | #define CURL_VERBOS_LEVEL 0 |
34 | 34 | ||
35 | #define DEAMON_TEST_PORT 4233 | ||
36 | |||
37 | #define test_data "Hello World\n" | 35 | #define test_data "Hello World\n" |
38 | #define ca_cert_file_name "tmp_ca_cert.pem" | 36 | #define ca_cert_file_name "tmp_ca_cert.pem" |
39 | 37 | ||
@@ -51,6 +49,7 @@ | |||
51 | struct https_test_data | 49 | struct https_test_data |
52 | { | 50 | { |
53 | void *cls; | 51 | void *cls; |
52 | int port; | ||
54 | const char *cipher_suite; | 53 | const char *cipher_suite; |
55 | int proto_version; | 54 | int proto_version; |
56 | }; | 55 | }; |
@@ -114,10 +113,10 @@ send_curl_req (char *url, struct CBC *cbc, const char *cipher_suite, | |||
114 | int proto_version); | 113 | int proto_version); |
115 | 114 | ||
116 | int | 115 | int |
117 | test_https_transfer (void *cls, const char *cipher_suite, int proto_version); | 116 | test_https_transfer (void *cls, int port, const char *cipher_suite, int proto_version); |
118 | 117 | ||
119 | int | 118 | int |
120 | setup_testcase (struct MHD_Daemon **d, int daemon_flags, va_list arg_list); | 119 | setup_testcase (struct MHD_Daemon **d, int port, int daemon_flags, va_list arg_list); |
121 | 120 | ||
122 | void teardown_testcase (struct MHD_Daemon *d); | 121 | void teardown_testcase (struct MHD_Daemon *d); |
123 | 122 | ||
@@ -135,7 +134,8 @@ teardown_session (gnutls_session_t session, | |||
135 | 134 | ||
136 | int | 135 | int |
137 | test_wrap (const char *test_name, int | 136 | test_wrap (const char *test_name, int |
138 | (*test_function) (void * cls, const char *cipher_suite, | 137 | (*test_function) (void * cls, int port, const char *cipher_suite, |
139 | int proto_version), void *test_function_cls, | 138 | int proto_version), void * cls, |
139 | int port, | ||
140 | int daemon_flags, const char *cipher_suite, int proto_version, ...); | 140 | int daemon_flags, const char *cipher_suite, int proto_version, ...); |
141 | #endif /* TLS_TEST_COMMON_H_ */ | 141 | #endif /* TLS_TEST_COMMON_H_ */ |