aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2023-07-04 01:52:46 -0500
committerBrent Cook <busterb@gmail.com>2023-07-04 01:52:46 -0500
commit23718ad1348c55ff5ba37384256a860b113be1e8 (patch)
treebd7b4f12519b0baf16cffdee72d3976eff816b00 /tests
parentb16ad4dbd4143aa27e89744a635ebd7d48697af4 (diff)
downloadportable-23718ad1348c55ff5ba37384256a860b113be1e8.tar.gz
portable-23718ad1348c55ff5ba37384256a860b113be1e8.tar.bz2
portable-23718ad1348c55ff5ba37384256a860b113be1e8.zip
reenable ssltest
failure was unrelated to tls 1.0/1.1 changes
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt12
-rw-r--r--tests/Makefile.am2
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 48d2da7..36c68a9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -659,12 +659,12 @@ add_test(ssl_versions ssl_versions)
659# ssltest 659# ssltest
660add_executable(ssltest ssltest.c) 660add_executable(ssltest ssltest.c)
661target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) 661target_link_libraries(ssltest ${OPENSSL_TEST_LIBS})
662#if(NOT MSVC) 662if(NOT MSVC)
663# add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) 663 add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh)
664#else() 664else()
665# add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>) 665 add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>)
666#endif() 666endif()
667#set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") 667set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
668 668
669# string_table 669# string_table
670add_executable(string_table string_table.c) 670add_executable(string_table string_table.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2ebbdf..70371d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -678,7 +678,7 @@ check_PROGRAMS += ssl_versions
678ssl_versions_SOURCES = ssl_versions.c 678ssl_versions_SOURCES = ssl_versions.c
679 679
680# ssltest 680# ssltest
681#TESTS += ssltest.sh 681TESTS += ssltest.sh
682check_PROGRAMS += ssltest 682check_PROGRAMS += ssltest
683ssltest_SOURCES = ssltest.c 683ssltest_SOURCES = ssltest.c
684EXTRA_DIST += ssltest.sh ssltest.bat 684EXTRA_DIST += ssltest.sh ssltest.bat