diff options
| author | Brent Cook <busterb@gmail.com> | 2023-07-04 06:52:41 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2023-07-04 06:52:41 -0500 |
| commit | 77ce9713e4e70b97d8465e278c566cbdb4ff2849 (patch) | |
| tree | 692d49dd011a91ed26f21bf67f96788d435746f9 /tests | |
| parent | 15d076b475ab12049b6b5dc5ab9cb360994c7ca4 (diff) | |
| parent | 23718ad1348c55ff5ba37384256a860b113be1e8 (diff) | |
| download | portable-77ce9713e4e70b97d8465e278c566cbdb4ff2849.tar.gz portable-77ce9713e4e70b97d8465e278c566cbdb4ff2849.tar.bz2 portable-77ce9713e4e70b97d8465e278c566cbdb4ff2849.zip | |
Land #874, reenable ssltest
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 715919e..9edb613 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
| @@ -660,12 +660,12 @@ add_test(ssl_versions ssl_versions) | |||
| 660 | # ssltest | 660 | # ssltest |
| 661 | add_executable(ssltest ssltest.c) | 661 | add_executable(ssltest ssltest.c) |
| 662 | target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) | 662 | target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) |
| 663 | #if(NOT MSVC) | 663 | if(NOT MSVC) |
| 664 | # add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) | 664 | add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) |
| 665 | #else() | 665 | else() |
| 666 | # add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>) | 666 | add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>) |
| 667 | #endif() | 667 | endif() |
| 668 | #set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | 668 | set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") |
| 669 | 669 | ||
| 670 | # string_table | 670 | # string_table |
| 671 | add_executable(string_table string_table.c) | 671 | 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 | |||
| 678 | ssl_versions_SOURCES = ssl_versions.c | 678 | ssl_versions_SOURCES = ssl_versions.c |
| 679 | 679 | ||
| 680 | # ssltest | 680 | # ssltest |
| 681 | #TESTS += ssltest.sh | 681 | TESTS += ssltest.sh |
| 682 | check_PROGRAMS += ssltest | 682 | check_PROGRAMS += ssltest |
| 683 | ssltest_SOURCES = ssltest.c | 683 | ssltest_SOURCES = ssltest.c |
| 684 | EXTRA_DIST += ssltest.sh ssltest.bat | 684 | EXTRA_DIST += ssltest.sh ssltest.bat |