Land #1141 - fix MinGW tests

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fde5406..fb0d16c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -568,7 +568,7 @@ add_platform_test(objectstest objectstest)
 if(ENABLE_EXTRATESTS)
         add_executable(ocsp_test ocsp_test.c)
         target_link_libraries(ocsp_test ${OPENSSL_TEST_LIBS})
-        if(NOT MSVC)
+        if(NOT WIN32)
                 add_test(NAME ocsptest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.sh)
         else()
                 add_test(NAME ocsptest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.bat $<TARGET_FILE:ocsp_test>)
@@ -617,7 +617,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 MSVC)
+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
@@ -630,7 +630,7 @@ set(QUICTEST_SRC quictest.c)
 add_executable(quictest ${QUICTEST_SRC})
 target_link_libraries(quictest ${OPENSSL_TEST_LIBS})
 prepare_emscripten_test_target(quictest)
-if(NOT MSVC)
+if(NOT WIN32)
         add_test(NAME quictest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/quictest.sh)
 else()
         add_test(NAME quictest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/quictest.bat $<TARGET_FILE:quictest>)
@@ -713,7 +713,7 @@ add_platform_test(rsa_test rsa_test)
 add_executable(servertest servertest.c)
 target_link_libraries(servertest ${OPENSSL_TEST_LIBS})
 prepare_emscripten_test_target(servertest)
-if(NOT MSVC)
+if(NOT WIN32)
         add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh)
 else()
         add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat $<TARGET_FILE:servertest>)
@@ -730,7 +730,7 @@ set(SHUTDOWNTEST_SRC shutdowntest.c)
 add_executable(shutdowntest ${SHUTDOWNTEST_SRC})
 target_link_libraries(shutdowntest ${OPENSSL_TEST_LIBS})
 prepare_emscripten_test_target(shutdowntest)
-if(NOT MSVC)
+if(NOT WIN32)
         add_test(NAME shutdowntest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/shutdowntest.sh)
 else()
         add_test(NAME shutdowntest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/shutdowntest.bat $<TARGET_FILE:shutdowntest>)
@@ -802,7 +802,7 @@ add_platform_test(ssl_versions ssl_versions)
 add_executable(ssltest ssltest.c)
 target_link_libraries(ssltest ${OPENSSL_TEST_LIBS})
 prepare_emscripten_test_target(ssltest)
-if(NOT MSVC)
+if(NOT WIN32)
         add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh)
 else()
         add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.bat $<TARGET_FILE:ssltest> $<TARGET_FILE:openssl>)
@@ -813,7 +813,7 @@ set_tests_properties(ssltest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 # access various files for IO. Adding such files to --preload-file is infeasible.
 if(NOT EMSCRIPTEN)
         # testdsa
-        if(NOT MSVC)
+        if(NOT WIN32)
                 add_test(NAME testdsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh)
         else()
                 add_test(NAME testdsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.bat $<TARGET_FILE:openssl>)
@@ -821,7 +821,7 @@ if(NOT EMSCRIPTEN)
         set_tests_properties(testdsa PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
         # testenc
-        if(NOT MSVC)
+        if(NOT WIN32)
                 add_test(NAME testenc COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testenc.sh)
         else()
                 add_test(NAME testenc COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testenc.bat $<TARGET_FILE:openssl>)
@@ -829,7 +829,7 @@ if(NOT EMSCRIPTEN)
         set_tests_properties(testenc PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
         # testrsa
-        if(NOT MSVC)
+        if(NOT WIN32)
                 add_test(NAME testrsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.sh)
         else()
                 add_test(NAME testrsa COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.bat $<TARGET_FILE:openssl>)
@@ -866,7 +866,7 @@ if(NOT (CMAKE_SYSTEM_NAME MATCHES "WindowsStore" OR EMSCRIPTEN))
 
         add_executable(tlstest ${TLSTEST_SRC})
         target_link_libraries(tlstest ${LIBTLS_TEST_LIBS})
-        if(NOT MSVC)
+        if(NOT WIN32)
                 add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh)
         else()
                 add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.bat $<TARGET_FILE:tlstest>)