From c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 15 Jan 2017 10:17:32 -0600 Subject: [PATCH] enable tlstest on win32 --- crypto/crypto_win.list | 1 + tests/CMakeLists.txt | 3 --- tests/Makefile.am | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/crypto/crypto_win.list b/crypto/crypto_win.list index 74de02c..6f89a43 100644 --- a/crypto/crypto_win.list +++ b/crypto/crypto_win.list @@ -1,6 +1,7 @@ arc4random_buf asprintf explicit_bzero +inet_pton gettimeofday posix_close posix_connect diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0b2f7fa..9196783 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -345,8 +345,6 @@ target_link_libraries(timingsafe ${TESTS_LIBS}) add_test(timingsafe timingsafe) # tlstest -if(NOT CMAKE_HOST_WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MINGW") - set(TLSTEST_SRC tlstest.c) check_function_exists(pipe2 HAVE_PIPE2) if(HAVE_PIPE2) @@ -363,7 +361,6 @@ else() add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat) endif() set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}") -endif() # tls_ext_alpn add_executable(tls_ext_alpn tls_ext_alpn.c) diff --git a/tests/Makefile.am b/tests/Makefile.am index 57347d6..c5dd713 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -333,7 +333,6 @@ check_PROGRAMS += timingsafe timingsafe_SOURCES = timingsafe.c # tlstest -if !HOST_WIN TESTS += tlstest.sh check_PROGRAMS += tlstest tlstest_SOURCES = tlstest.c @@ -341,7 +340,6 @@ if !HAVE_PIPE2 tlstest_SOURCES += compat/pipe2.c endif EXTRA_DIST += tlstest.sh tlstest.bat -endif # tls_ext_alpn TESTS += tls_ext_alpn