Tests: Add paths to libraries on Windows

Author: ralight

CMakeLists.txt

@@ -48,6 +48,17 @@ if(WITH_TESTS)
 	find_package(GTest REQUIRED)
 	include(GoogleTest)
 	enable_testing()
+
+	function(test_set_windows_path TEST_NAME)
+		if(WIN32)
+			set(PATHMOD
+				"PATH=path_list_prepend:$<TARGET_FILE_DIR:libmosquitto_common>"
+				"PATH=path_list_prepend:$<TARGET_FILE_DIR:libmosquitto>"
+				"PATH=path_list_prepend:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin"
+			)
+			set_property(TEST ${TEST_NAME} PROPERTY ENVIRONMENT_MODIFICATION "${PATHMOD}")
+		endif()
+	endfunction()
 	
 	function(add_python_tests_from_current_directory2 PREFIX PY_TEST_FILES EXCLUDE_LIST)
 		foreach(PY_TEST_FILE ${PY_TEST_FILES})
@@ -60,6 +71,7 @@ if(WITH_TESTS)
 				PROPERTIES
 					ENVIRONMENT "BUILD_ROOT=${CMAKE_BINARY_DIR}"
 			)
+			test_set_windows_path(${PREFIX}-${PY_TEST_NAME})
 		endforeach()
 	endfunction()
 	

test/broker/CMakeLists.txt

@@ -35,5 +35,6 @@ foreach(PERSIST_TYPE ${PERSIST_LIST})
             PROPERTIES
                 ENVIRONMENT "BUILD_ROOT=${CMAKE_BINARY_DIR}"
         )
+		test_set_windows_path(broker-${PY_TEST_NAME}-${PERSIST_TYPE})
     endforeach()
 endforeach()

test/unit/broker/CMakeLists.txt

@@ -14,6 +14,7 @@ add_executable(bridge-topic-test
 target_compile_definitions(bridge-topic-test PRIVATE WITH_BRIDGE WITH_BROKER)
 target_link_libraries(bridge-topic-test PRIVATE bridge-topic-obj common-unit-test-header libmosquitto_common OpenSSL::SSL)
 add_test(NAME unit-bridge-topic-test COMMAND bridge-topic-test)
+test_set_windows_path(unit-bridge-topic-test)
 
 # keepalive-test
 add_executable(keepalive-test
@@ -23,6 +24,7 @@ add_executable(keepalive-test
 target_compile_definitions(keepalive-test PRIVATE WITH_BROKER)
 target_link_libraries(keepalive-test PRIVATE common-unit-test-header libmosquitto_common OpenSSL::SSL)
 add_test(NAME unit-keepalive-test COMMAND keepalive-test)
+test_set_windows_path(unit-keepalive-test)
 
 # persist-read-test
 add_library(persistence-read-obj
@@ -51,6 +53,7 @@ if(WIN32)
 	target_link_libraries(persist-read-test PRIVATE ws2_32)
 endif()
 add_test(NAME unit-persist-read-test COMMAND persist-read-test)
+test_set_windows_path(unit-persist-read-test)
 
 # persist-write-test
 add_library(persistence-write-obj
@@ -84,6 +87,7 @@ if(WIN32)
 	target_link_libraries(persist-write-test PRIVATE ws2_32)
 endif()
 add_test(NAME unit-persist-write-test COMMAND persist-write-test)
+test_set_windows_path(unit-persist-write-test)
 
 # subs-test
 add_library(subs-obj
@@ -112,3 +116,4 @@ if(WIN32)
 endif()
 
 add_test(NAME unit-subs-test COMMAND subs-test)
+test_set_windows_path(unit-subs-test)

test/unit/lib/CMakeLists.txt

@@ -22,3 +22,4 @@ if(WIN32)
 	endif()
 endif()
 add_test(NAME unit-lib-test COMMAND lib-test)
+test_set_windows_path(unit-lib-test)

test/unit/libcommon/CMakeLists.txt

@@ -20,3 +20,4 @@ target_link_libraries(libcommon-test
 		libmosquitto_common
 )
 add_test(NAME unit-libcommon-test COMMAND libcommon-test)
+test_set_windows_path(unit-libcommon-test)