cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 04:19:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

test/regress: fix ssl-less builds (need to make this prettier)

Browse Source 
CI: https://travis-ci.org/libevent/libevent/jobs/89590839
This commit is contained in:
Azat Khuzhin 2015-11-06 10:13:13 +03:00
parent 45a284acfd
commit 3160716f26
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/regress.h
View File

@ -34,8 +34,6 @@ extern "C" {
#include "tinytest.h" #include "tinytest.h"
#include "tinytest_macros.h" #include "tinytest_macros.h"
#include <openssl/ssl.h>
extern struct testcase_t main_testcases[]; extern struct testcase_t main_testcases[];
extern struct testcase_t evtag_testcases[]; extern struct testcase_t evtag_testcases[];
extern struct testcase_t evbuffer_testcases[]; extern struct testcase_t evbuffer_testcases[];
@ -132,6 +130,7 @@ pid_t regress_fork(void);
#endif #endif
#ifdef EVENT__HAVE_OPENSSL #ifdef EVENT__HAVE_OPENSSL
#include <openssl/ssl.h>
EVP_PKEY *ssl_getkey(void); EVP_PKEY *ssl_getkey(void);
X509 *ssl_getcert(void); X509 *ssl_getcert(void);
SSL_CTX *get_ssl_ctx(void); SSL_CTX *get_ssl_ctx(void);

57
test/regress_http.c
View File

@ -126,6 +126,7 @@ http_bind(struct evhttp *myhttp, ev_uint16_t *pport, int mask)
return 0; return 0;
} }
#ifdef EVENT__HAVE_OPENSSL
static struct bufferevent * static struct bufferevent *
https_bev(struct event_base *base, void *arg) https_bev(struct event_base *base, void *arg)
{ {
@ -138,21 +139,23 @@ https_bev(struct event_base *base, void *arg)
base, -1, ssl, BUFFEREVENT_SSL_ACCEPTING, base, -1, ssl, BUFFEREVENT_SSL_ACCEPTING,
BEV_OPT_CLOSE_ON_FREE); BEV_OPT_CLOSE_ON_FREE);
} }
#endif
static struct evhttp * static struct evhttp *
http_setup(ev_uint16_t *pport, struct event_base *base, int mask) http_setup(ev_uint16_t *pport, struct event_base *base, int mask)
{ {
struct evhttp *myhttp; struct evhttp *myhttp;
int ssl = mask & HTTP_BIND_SSL;
/* Try a few different ports */ /* Try a few different ports */
myhttp = evhttp_new(base); myhttp = evhttp_new(base);
if (http_bind(myhttp, pport, mask) < 0) if (http_bind(myhttp, pport, mask) < 0)
return NULL; return NULL;
if (ssl) { #ifdef EVENT__HAVE_OPENSSL
if (mask & HTTP_BIND_SSL) {
init_ssl(); init_ssl();
evhttp_set_bevcb(myhttp, https_bev, NULL); evhttp_set_bevcb(myhttp, https_bev, NULL);
} }
#endif
/* Register a callback for certain types of requests */ /* Register a callback for certain types of requests */
evhttp_set_cb(myhttp, "/test", http_basic_cb, base); evhttp_set_cb(myhttp, "/test", http_basic_cb, base);
@ -438,15 +441,17 @@ static struct bufferevent *
create_bev(struct event_base *base, int fd, int ssl) create_bev(struct event_base *base, int fd, int ssl)
{ {
int flags = BEV_OPT_DEFER_CALLBACKS; int flags = BEV_OPT_DEFER_CALLBACKS;
struct bufferevent *bev; struct bufferevent *bev = NULL;
if (!ssl) { if (!ssl) {
bev = bufferevent_socket_new(base, fd, flags); bev = bufferevent_socket_new(base, fd, flags);
} else { } else {
#ifdef EVENT__HAVE_OPENSSL
SSL *ssl = SSL_new(get_ssl_ctx()); SSL *ssl = SSL_new(get_ssl_ctx());
bev = bufferevent_openssl_socket_new( bev = bufferevent_openssl_socket_new(
base, fd, ssl, BUFFEREVENT_SSL_CONNECTING, flags); base, fd, ssl, BUFFEREVENT_SSL_CONNECTING, flags);
bufferevent_openssl_set_allow_dirty_shutdown(bev, 1); bufferevent_openssl_set_allow_dirty_shutdown(bev, 1);
#endif
} }
return bev; return bev;
@ -548,8 +553,6 @@ http_basic_test_impl(void *arg, int ssl)
} }
static void http_basic_test(void *arg) static void http_basic_test(void *arg)
{ return http_basic_test_impl(arg, 0); } { return http_basic_test_impl(arg, 0); }
static void https_basic_test(void *arg)
{ return http_basic_test_impl(arg, 1); }
static void static void
@ -2914,10 +2917,7 @@ static void http_incomplete_test(void *arg)
{ http_incomplete_test_(arg, 0, 0); } { http_incomplete_test_(arg, 0, 0); }
static void http_incomplete_timeout_test(void *arg) static void http_incomplete_timeout_test(void *arg)
{ http_incomplete_test_(arg, 1, 0); } { http_incomplete_test_(arg, 1, 0); }
static void https_incomplete_test(void *arg)
{ http_incomplete_test_(arg, 0, 1); }
static void https_incomplete_timeout_test(void *arg)
{ http_incomplete_test_(arg, 1, 1); }
/* /*
* the server is going to reply with chunked data. * the server is going to reply with chunked data.
@ -3444,21 +3444,8 @@ http_simple_test_impl(void *arg, int ssl, int dirty)
if (http) if (http)
evhttp_free(http); evhttp_free(http);
} }
static void static void http_simple_test(void *arg)
http_simple_test(void *arg) { return http_simple_test_impl(arg, 0, 0); }
{
return http_simple_test_impl(arg, 0, 0);
}
static void
https_simple_test(void *arg)
{
return http_simple_test_impl(arg, 1, 0);
}
static void
https_simple_dirty_test(void *arg)
{
return http_simple_test_impl(arg, 1, 1);
}
static void static void
http_connection_retry_test_basic(void *arg, const char *addr, struct evdns_base *dns_base, int ssl) http_connection_retry_test_basic(void *arg, const char *addr, struct evdns_base *dns_base, int ssl)
@ -3617,8 +3604,6 @@ http_connection_retry_conn_address_test_impl(void *arg, int ssl)
} }
static void http_connection_retry_conn_address_test(void *arg) static void http_connection_retry_conn_address_test(void *arg)
{ return http_connection_retry_conn_address_test_impl(arg, 0); } { return http_connection_retry_conn_address_test_impl(arg, 0); }
static void https_connection_retry_conn_address_test(void *arg)
{ return http_connection_retry_conn_address_test_impl(arg, 1); }
static void static void
http_connection_retry_test_impl(void *arg, int ssl) http_connection_retry_test_impl(void *arg, int ssl)
@ -3628,9 +3613,6 @@ http_connection_retry_test_impl(void *arg, int ssl)
static void static void
http_connection_retry_test(void *arg) http_connection_retry_test(void *arg)
{ return http_connection_retry_test_impl(arg, 0); } { return http_connection_retry_test_impl(arg, 0); }
static void
https_connection_retry_test(void *arg)
{ return http_connection_retry_test_impl(arg, 1); }
static void static void
http_primitives(void *ptr) http_primitives(void *ptr)
@ -4231,6 +4213,23 @@ http_request_own_test(void *arg)
#define HTTPS(name) \ #define HTTPS(name) \
{ "https_" #name, https_##name##_test, TT_ISOLATED, &basic_setup, NULL } { "https_" #name, https_##name##_test, TT_ISOLATED, &basic_setup, NULL }
#ifdef EVENT__HAVE_OPENSSL
static void https_basic_test(void *arg)
{ return http_basic_test_impl(arg, 1); }
static void https_incomplete_test(void *arg)
{ http_incomplete_test_(arg, 0, 1); }
static void https_incomplete_timeout_test(void *arg)
{ http_incomplete_test_(arg, 1, 1); }
static void https_simple_test(void *arg)
{ return http_simple_test_impl(arg, 1, 0); }
static void https_simple_dirty_test(void *arg)
{ return http_simple_test_impl(arg, 1, 1); }
static void https_connection_retry_conn_address_test(void *arg)
{ return http_connection_retry_conn_address_test_impl(arg, 1); }
static void https_connection_retry_test(void *arg)
{ return http_connection_retry_test_impl(arg, 1); }
#endif
struct testcase_t http_testcases[] = { struct testcase_t http_testcases[] = {
{ "primitives", http_primitives, 0, NULL, NULL }, { "primitives", http_primitives, 0, NULL, NULL },
{ "base", http_base_test, TT_FORK, NULL, NULL }, { "base", http_base_test, TT_FORK, NULL, NULL },