fixed jenkins test failure

This commit is contained in:
Hideki Miyazaki
2019-03-30 01:35:35 +09:00
parent 1c22f14d1c
commit 6968797848

View File

@@ -2024,7 +2024,7 @@ done:
} }
#if defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #if defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
static THREAD_RETURN WOLFSSL_THREAD test_server_loop(void* args) static THREAD_RETURN WOLFSSL_THREAD test_server_loop(void* args)
{ {
SOCKET_T sockfd = 0; SOCKET_T sockfd = 0;
@@ -2214,7 +2214,7 @@ done:
return 0; return 0;
#endif #endif
} }
#endif //defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #endif //defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
typedef int (*cbType)(WOLFSSL_CTX *ctx, WOLFSSL *ssl); typedef int (*cbType)(WOLFSSL_CTX *ctx, WOLFSSL *ssl);
@@ -2388,7 +2388,7 @@ done:
return; return;
} }
#if defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #if defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
static void test_client_reuse_WOLFSSLobj(void* args, void *cb, void* server_args) static void test_client_reuse_WOLFSSLobj(void* args, void *cb, void* server_args)
{ {
SOCKET_T sockfd = 0; SOCKET_T sockfd = 0;
@@ -2607,7 +2607,7 @@ done:
return; return;
} }
#endif //defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #endif //defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
#endif /* !NO_WOLFSSL_CLIENT && !NO_WOLFSSL_SERVER */ #endif /* !NO_WOLFSSL_CLIENT && !NO_WOLFSSL_SERVER */
@@ -2928,7 +2928,7 @@ static void test_wolfSSL_read_write(void)
#endif #endif
} }
#if defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #if defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
static void test_wolfSSL_reuse_WOLFSSLobj(void) static void test_wolfSSL_reuse_WOLFSSLobj(void)
{ {
#ifdef HAVE_IO_TESTS_DEPENDENCIES #ifdef HAVE_IO_TESTS_DEPENDENCIES
@@ -2976,7 +2976,7 @@ static void test_wolfSSL_reuse_WOLFSSLobj(void)
#endif #endif
} }
#endif //defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #endif //defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
#endif /* !NO_WOLFSSL_CLIENT && !NO_WOLFSSL_SERVER */ #endif /* !NO_WOLFSSL_CLIENT && !NO_WOLFSSL_SERVER */
@@ -24336,7 +24336,7 @@ void ApiTest(void)
test_SetTmpEC_DHE_Sz(); test_SetTmpEC_DHE_Sz();
#if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER) #if !defined(NO_WOLFSSL_CLIENT) && !defined(NO_WOLFSSL_SERVER)
test_wolfSSL_read_write(); test_wolfSSL_read_write();
#if defined(OPENSSL_EXTRA) && !defined(WOLFSSL_TLS13) #if defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE) && !defined(WOLFSSL_TLS13)
test_wolfSSL_reuse_WOLFSSLobj(); test_wolfSSL_reuse_WOLFSSLobj();
#endif #endif
#endif #endif