aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2017-01-15 10:17:32 -0600
committerBrent Cook <busterb@gmail.com>2017-01-15 16:00:17 -0600
commitc53c23c5d8a4de5c231a282e1bd70b7f3b1b438f (patch)
tree7741914c7f4d10ce73a59911b95c21d284981510
parent057e7a85b903e431fa6a7236bb739d04a6e7a9c5 (diff)
downloadportable-c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f.tar.gz
portable-c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f.tar.bz2
portable-c53c23c5d8a4de5c231a282e1bd70b7f3b1b438f.zip
enable tlstest on win32
-rw-r--r--crypto/crypto_win.list1
-rw-r--r--tests/CMakeLists.txt3
-rw-r--r--tests/Makefile.am2
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 @@
1arc4random_buf 1arc4random_buf
2asprintf 2asprintf
3explicit_bzero 3explicit_bzero
4inet_pton
4gettimeofday 5gettimeofday
5posix_close 6posix_close
6posix_connect 7posix_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})
345add_test(timingsafe timingsafe) 345add_test(timingsafe timingsafe)
346 346
347# tlstest 347# tlstest
348if(NOT CMAKE_HOST_WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MINGW")
349
350set(TLSTEST_SRC tlstest.c) 348set(TLSTEST_SRC tlstest.c)
351check_function_exists(pipe2 HAVE_PIPE2) 349check_function_exists(pipe2 HAVE_PIPE2)
352if(HAVE_PIPE2) 350if(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)
364endif() 362endif()
365set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}") 363set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
366endif()
367 364
368# tls_ext_alpn 365# tls_ext_alpn
369add_executable(tls_ext_alpn tls_ext_alpn.c) 366add_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
333timingsafe_SOURCES = timingsafe.c 333timingsafe_SOURCES = timingsafe.c
334 334
335# tlstest 335# tlstest
336if !HOST_WIN
337TESTS += tlstest.sh 336TESTS += tlstest.sh
338check_PROGRAMS += tlstest 337check_PROGRAMS += tlstest
339tlstest_SOURCES = tlstest.c 338tlstest_SOURCES = tlstest.c
@@ -341,7 +340,6 @@ if !HAVE_PIPE2
341tlstest_SOURCES += compat/pipe2.c 340tlstest_SOURCES += compat/pipe2.c
342endif 341endif
343EXTRA_DIST += tlstest.sh tlstest.bat 342EXTRA_DIST += tlstest.sh tlstest.bat
344endif
345 343
346# tls_ext_alpn 344# tls_ext_alpn
347TESTS += tls_ext_alpn 345TESTS += tls_ext_alpn