Inject DLL paths on TestFoundation

Author: stevapple

Tests/Foundation/CMakeLists.txt

@@ -179,11 +179,14 @@ add_custom_command(TARGET TestFoundation POST_BUILD
   COMMAND
     ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:FoundationXML> ${CMAKE_BINARY_DIR}/TestFoundation.app)
 
+cmake_path(GET CMAKE_Swift_COMPILER PARENT_PATH Swift_LIBRARY_PATH)
+# NOTE(stevapple): Path separator ; is passed as ? because it conflicts with CMake's list separator
 xctest_discover_tests(TestFoundation
                       COMMAND
                         ${CMAKE_BINARY_DIR}/TestFoundation.app/TestFoundation${CMAKE_EXECUTABLE_SUFFIX}
                       WORKING_DIRECTORY
                         ${CMAKE_BINARY_DIR}/TestFoundation.app
                       PROPERTIES
                         ENVIRONMENT
-                          LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/TestFoundation.app:$<TARGET_LINKER_FILE_DIR:XCTest>:$<TARGET_LINKER_FILE_DIR:dispatch>:$<TARGET_LINKER_FILE_DIR:swiftDispatch>:$<TARGET_LINKER_FILE_DIR:BlocksRuntime>)
+                          LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/TestFoundation.app:$<TARGET_LINKER_FILE_DIR:XCTest>:$<TARGET_LINKER_FILE_DIR:dispatch>:$<TARGET_LINKER_FILE_DIR:swiftDispatch>:$<TARGET_LINKER_FILE_DIR:BlocksRuntime>
+                          DLL_LIBRARY_PATH=${Swift_LIBRARY_PATH}?${CMAKE_BINARY_DIR}/bin?$<TARGET_FILE_DIR:XCTest>?$<TARGET_FILE_DIR:dispatch>)

cmake/modules/XCTestAddTests.cmake

@@ -1,4 +1,4 @@
-set(properties ${TEST_PROPERTIES})
+set(properties "${TEST_PROPERTIES}")
 set(script)
 set(tests)
 
@@ -21,7 +21,7 @@ if(NOT EXISTS "${TEST_EXECUTABLE}")
   )
 endif()
 # We need to figure out if some environment is needed to run the test listing.
-cmake_parse_arguments("_properties" "" "ENVIRONMENT" "" ${properties})
+cmake_parse_arguments("_properties" "" "" "ENVIRONMENT" ${properties})
 if(_properties_ENVIRONMENT)
   foreach(_env ${_properties_ENVIRONMENT})
     string(REGEX REPLACE "([a-zA-Z0-9_]+)=(.*)" "\\1" _key "${_env}")
@@ -31,6 +31,13 @@ if(_properties_ENVIRONMENT)
     endif()
   endforeach()
 endif()
+# Set Path to avoid DLL missing
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
+  string(REPLACE "?" ";" DLL_LIBRARY_PATH "$ENV{DLL_LIBRARY_PATH}")
+  set(ENV{Path} "${DLL_LIBRARY_PATH};$ENV{Path}")
+  string(REPLACE ";" "\\\\;" DLL_LIBRARY_PATH "${DLL_LIBRARY_PATH}")
+endif()
+
 execute_process(
   COMMAND "${TEST_EXECUTABLE}" --list-tests
   WORKING_DIRECTORY "${TEST_WORKING_DIR}"
@@ -75,6 +82,13 @@ foreach(line ${output})
       WORKING_DIRECTORY "${TEST_WORKING_DIR}"
       ${properties}
     )
+    if (CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
+      add_command(set_tests_properties
+        "${pretty_target}"
+        PROPERTIES
+        ENVIRONMENT "Path=${DLL_LIBRARY_PATH}"
+      )
+    endif()
     list(APPEND tests "${pretty_target}")
   else()
     message(FATAL_ERROR