Fix Windows tests within CMake

1 files changed, 25 insertions, 23 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4cc55d8..4942e0a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,6 +24,8 @@ foreach(lib IN LISTS OPENSSL_LIBS)
         endif()
 endforeach()
 
+file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} TEST_SOURCE_DIR)
+
 # aeadtest
 add_executable(aeadtest aeadtest.c)
 target_link_libraries(aeadtest ${TESTS_LIBS})
@@ -242,9 +244,9 @@ if(ENABLE_EXTRATESTS)
         add_executable(ocsp_test ocsp_test.c)
         target_link_libraries(ocsp_test ${TESTS_LIBS})
         if(NOT MSVC)
-                add_test(ocsptest ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.sh)
+                add_test(NAME ocsptest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.sh)
         else()
-                add_test(ocsptest ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.bat)
+                add_test(NAME ocsptest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.bat $<TARGET_FILE:ocsp_test>)
         endif()
 endif()
 
@@ -281,11 +283,11 @@ add_test(poly1305test poly1305test)
 add_executable(pq_test pq_test.c)
 target_link_libraries(pq_test ${TESTS_LIBS})
 if(NOT MSVC)
-        add_test(pq_test ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh)
+        add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh)
 else()
-        add_test(pq_test ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.bat)
+        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=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # randtest
 add_executable(randtest randtest.c)
@@ -325,11 +327,11 @@ add_test(rsa_test rsa_test)
 add_executable(servertest servertest.c)
 target_link_libraries(servertest ${TESTS_LIBS})
 if(NOT MSVC)
-        add_test(servertest ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh)
+        add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh)
 else()
-        add_test(servertest ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat)
+        add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat $<TARGET_FILE:servertest>)
 endif()
-set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # sha1test
 add_executable(sha1test sha1test.c)
@@ -355,35 +357,35 @@ add_test(ssl_versions ssl_versions)
 add_executable(ssltest ssltest.c)
 target_link_libraries(ssltest ${TESTS_LIBS})
 if(NOT MSVC)
-        add_test(ssltest ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh)
+        add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh)
 else()
-        add_test(ssltest ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat)
+        add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>)
 endif()
-set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # testdsa
 if(NOT MSVC)
-        add_test(testdsa ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh)
+        add_test(NAME testdsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh)
 else()
-        add_test(testdsa ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.bat)
+        add_test(NAME testdsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.bat $<TARGET_FILE:openssl>)
 endif()
-set_tests_properties(testdsa PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(testdsa PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # testenc
 if(NOT MSVC)
-        add_test(testenc ${CMAKE_CURRENT_SOURCE_DIR}/testenc.sh)
+        add_test(NAME testenc COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testenc.sh)
 else()
-        add_test(testenc ${CMAKE_CURRENT_SOURCE_DIR}/testenc.bat)
+        add_test(NAME testenc COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testenc.bat $<TARGET_FILE:openssl>)
 endif()
-set_tests_properties(testenc PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(testenc PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # testrsa
 if(NOT MSVC)
-        add_test(testrsa ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.sh)
+        add_test(NAME testrsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.sh)
 else()
-        add_test(testrsa ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.bat)
+        add_test(NAME testrsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.bat $<TARGET_FILE:openssl>)
 endif()
-set_tests_properties(testrsa PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(testrsa PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # timingsafe
 add_executable(timingsafe timingsafe.c)
@@ -407,11 +409,11 @@ endif()
 add_executable(tlstest ${TLSTEST_SRC})
 target_link_libraries(tlstest ${TESTS_LIBS})
 if(NOT MSVC)
-        add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
+        add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
 else()
-        add_test(tlstest ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat)
+        add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat $<TARGET_FILE:tlstest>)
 endif()
-set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+set_tests_properties(tlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
 # tls_ext_alpn
 add_executable(tls_ext_alpn tls_ext_alpn.c)