diff options
author | Brent Cook <busterb@gmail.com> | 2017-01-15 10:17:32 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2017-01-15 16:00:17 -0600 |
commit | c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f (patch) | |
tree | 7741914c7f4d10ce73a59911b95c21d284981510 | |
parent | 057e7a85b903e431fa6a7236bb739d04a6e7a9c5 (diff) | |
download | portable-c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f.tar.gz portable-c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f.tar.bz2 portable-c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f.zip |
enable tlstest on win32
-rw-r--r-- | crypto/crypto_win.list | 1 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 1 insertions, 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 @@ | |||
1 | arc4random_buf | 1 | arc4random_buf |
2 | asprintf | 2 | asprintf |
3 | explicit_bzero | 3 | explicit_bzero |
4 | inet_pton | ||
4 | gettimeofday | 5 | gettimeofday |
5 | posix_close | 6 | posix_close |
6 | posix_connect | 7 | 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}) | |||
345 | add_test(timingsafe timingsafe) | 345 | add_test(timingsafe timingsafe) |
346 | 346 | ||
347 | # tlstest | 347 | # tlstest |
348 | if(NOT CMAKE_HOST_WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MINGW") | ||
349 | |||
350 | set(TLSTEST_SRC tlstest.c) | 348 | set(TLSTEST_SRC tlstest.c) |
351 | check_function_exists(pipe2 HAVE_PIPE2) | 349 | check_function_exists(pipe2 HAVE_PIPE2) |
352 | if(HAVE_PIPE2) | 350 | if(HAVE_PIPE2) |
@@ -363,7 +361,6 @@ else() | |||
363 | add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat) | 361 | add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat) |
364 | endif() | 362 | endif() |
365 | set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}") | 363 | set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}") |
366 | endif() | ||
367 | 364 | ||
368 | # tls_ext_alpn | 365 | # tls_ext_alpn |
369 | add_executable(tls_ext_alpn tls_ext_alpn.c) | 366 | 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 | |||
333 | timingsafe_SOURCES = timingsafe.c | 333 | timingsafe_SOURCES = timingsafe.c |
334 | 334 | ||
335 | # tlstest | 335 | # tlstest |
336 | if !HOST_WIN | ||
337 | TESTS += tlstest.sh | 336 | TESTS += tlstest.sh |
338 | check_PROGRAMS += tlstest | 337 | check_PROGRAMS += tlstest |
339 | tlstest_SOURCES = tlstest.c | 338 | tlstest_SOURCES = tlstest.c |
@@ -341,7 +340,6 @@ if !HAVE_PIPE2 | |||
341 | tlstest_SOURCES += compat/pipe2.c | 340 | tlstest_SOURCES += compat/pipe2.c |
342 | endif | 341 | endif |
343 | EXTRA_DIST += tlstest.sh tlstest.bat | 342 | EXTRA_DIST += tlstest.sh tlstest.bat |
344 | endif | ||
345 | 343 | ||
346 | # tls_ext_alpn | 344 | # tls_ext_alpn |
347 | TESTS += tls_ext_alpn | 345 | TESTS += tls_ext_alpn |