From 23718ad1348c55ff5ba37384256a860b113be1e8 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 4 Jul 2023 01:52:46 -0500 Subject: reenable ssltest failure was unrelated to tls 1.0/1.1 changes --- tests/CMakeLists.txt | 12 ++++++------ tests/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') 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) # ssltest add_executable(ssltest ssltest.c) target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) -#if(NOT MSVC) -# add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) -#else() -# add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $ $) -#endif() -#set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") +if(NOT MSVC) + add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) +else() + add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $ $) +endif() +set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") # string_table add_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 ssl_versions_SOURCES = ssl_versions.c # ssltest -#TESTS += ssltest.sh +TESTS += ssltest.sh check_PROGRAMS += ssltest ssltest_SOURCES = ssltest.c EXTRA_DIST += ssltest.sh ssltest.bat -- cgit v1.2.3-55-g6feb