1 files changed, 37 insertions, 21 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d7cc499..55529cd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,18 @@
+#
+# Copyright (c) 2015 Brent Cook
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
 
 include_directories(
@@ -65,6 +80,9 @@ function(add_platform_test TEST_NAME)
         endif()
 endfunction()
 
+# XXX - should probably be in their own static lib
+set(TEST_HELPER_SRC test.c test_util.c)
+
 # aeadtest
 add_executable(aeadtest aeadtest.c)
 target_link_libraries(aeadtest ${OPENSSL_TEST_LIBS})
@@ -449,6 +467,7 @@ add_platform_test(evptest evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptests.txt)
 # evp_test
 add_executable(evp_test evp_test.c)
 target_link_libraries(evp_test ${OPENSSL_TEST_LIBS})
+prepare_emscripten_test_target(evp_test)
 add_platform_test(evp_test evp_test)
 
 # exdata_test
@@ -536,19 +555,24 @@ prepare_emscripten_test_target(lhash_test)
 add_platform_test(lhash_test lhash_test)
 
 # md_test
-add_executable(md_test md_test.c)
-target_link_libraries(md_test ${OPENSSL_TEST_LIBS})
-add_platform_test(md_test md_test)
+# XXX - ftruncate and mkstemp missing from Windows
+if(NOT WIN32)
+        add_executable(md_test md_test.c ${TEST_HELPER_SRC})
+        target_link_libraries(md_test ${OPENSSL_TEST_LIBS})
+        add_platform_test(md_test md_test)
+endif()
 
 # mlkem_tests
-add_executable(mlkem_tests mlkem_tests.c mlkem_tests_util.c parse_test_file.c)
+add_executable(mlkem_tests mlkem_tests.c parse_test_file.c)
 target_link_libraries(mlkem_tests ${OPENSSL_TEST_LIBS})
 prepare_emscripten_test_target(mlkem_tests)
-if(NOT WIN32)
+if(NOT MSVC)
         add_test(NAME mlkem_tests COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mlkem_tests.sh)
         set_tests_properties(mlkem_tests PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+else()
+        add_test(NAME mlkem_tests COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mlkem_tests.bat $<TARGET_FILE:mlkem_tests>)
 endif()
-# XXX - add tests for Windows
+set_tests_properties(mlkem_tests PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # mlkem_iteration_tests
 add_executable(mlkem_iteration_tests mlkem_iteration_tests.c mlkem_tests_util.c)
@@ -620,13 +644,7 @@ add_platform_test(policy policy)
 # pq_test
 add_executable(pq_test pq_test.c)
 target_link_libraries(pq_test ${OPENSSL_TEST_LIBS})
-if(NOT WIN32)
-        add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh)
-else()
-        add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.bat
-                $<TARGET_FILE:pq_test>)
-endif()
-set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+add_platform_test(pq_test pq_test)
 
 # quictest
 set(QUICTEST_SRC quictest.c)
@@ -724,9 +742,12 @@ endif()
 set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # sha_test
-add_executable(sha_test sha_test.c)
-target_link_libraries(sha_test ${OPENSSL_TEST_LIBS})
-add_platform_test(sha_test sha_test)
+# XXX - ftruncate and mkstemp missing from Windows
+if(NOT WIN32)
+        add_executable(sha_test sha_test.c ${TEST_HELPER_SRC})
+        target_link_libraries(sha_test ${OPENSSL_TEST_LIBS})
+        add_platform_test(sha_test sha_test)
+endif()
 
 # shutdowntest
 set(SHUTDOWNTEST_SRC shutdowntest.c)
@@ -938,11 +959,6 @@ add_executable(x509_name_test x509_name_test.c)
 target_link_libraries(x509_name_test ${OPENSSL_TEST_LIBS})
 add_platform_test(x509_name_test x509_name_test)
 
-# x509name
-add_executable(x509name x509name.c)
-target_link_libraries(x509name ${OPENSSL_TEST_LIBS})
-add_platform_test(x509name x509name)
-
 # x509req_ext
 add_executable(x509req_ext x509req_ext.c)
 target_link_libraries(x509req_ext ${OPENSSL_TEST_LIBS})