Merge pull request #12426 from meh7an/fix/mingw-runtime-path-prx-loader-tests

test(libs): give the prx loader tests the MinGW runtime on their PATH

core/libs/CMakeLists.txt

@@ -480,6 +480,11 @@ if(BUILD_TESTING)
         add_test(NAME guest_kernel_sys_threads_${case} COMMAND guest_kernel_sys_threads_tests ${UNPATCHED_DIR} unpatched ${case})
         add_test(NAME guest_kernel_sys_threads_${case}_patched COMMAND guest_kernel_sys_threads_tests ${PATCHED_DIR} patched ${case})
         set_tests_properties(guest_kernel_sys_threads_${case} guest_kernel_sys_threads_${case}_patched PROPERTIES TIMEOUT 20)
+        if(MINGW)
+            get_filename_component(kernelSysThreadsRuntimeDirectory "${CMAKE_CXX_COMPILER}" DIRECTORY)
+            set_tests_properties(guest_kernel_sys_threads_${case} guest_kernel_sys_threads_${case}_patched PROPERTIES
+                ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${kernelSysThreadsRuntimeDirectory}")
+        endif()
     endforeach()
 
     add_test_executable(guest_gnm_neo_packets_tests tests/GuestGnmNeoPackets.cpp)

core/libs/prx/libSceNet/CMakeLists.txt

@@ -16,6 +16,11 @@ if(BUILD_TESTING)
     endif()
     add_test(NAME net_ipv6only_patched COMMAND net_ipv6only_patched_tests ${PATCHED_DIR})
     set_tests_properties(net_ipv6only_patched PROPERTIES TIMEOUT 20 SKIP_RETURN_CODE 77)
+    if(MINGW)
+        get_filename_component(ipv6OnlyPatchedRuntimeDirectory "${CMAKE_CXX_COMPILER}" DIRECTORY)
+        set_tests_properties(net_ipv6only_patched PROPERTIES
+            ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${ipv6OnlyPatchedRuntimeDirectory}")
+    endif()
     add_test_executable(net_ipv6only_tests tests/Ipv6Only.cpp)
     target_include_directories(net_ipv6only_tests PRIVATE ${LIBS_INCLUDE_DIR})
     target_link_libraries(net_ipv6only_tests PRIVATE libSceNet libkernel libc)