From 3bd779670fb563c392cf22caf516e80ed766500a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 21 May 2026 16:19:16 -0600 Subject: [PATCH 1/3] test: remove Threads from explicit test package order Now that googletest can resolve its Threads dependency through the new dependency resolution system (issue #331), Threads no longer needs to be explicitly ordered before googletest in the test package list. This change removes Threads from the explicit package ordering since googletest's dependency on Threads is now properly handled via the new ${pkg}-deps.cmake mechanism. fixes https://github.com/externpro/externpro/issues/331 --- test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 9a4d4ff..1bbdd92 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,8 +3,8 @@ get_cmake_property(pros VARIABLES) # xp_ variables from pros.cmake, included by xproinc.cmake list(FILTER pros INCLUDE REGEX "^xp_") list(SORT pros) -list(REMOVE_ITEM pros xp_googletest xp_Threads) -list(PREPEND pros xp_Threads xp_googletest) # make Threads and googletest first +list(REMOVE_ITEM pros xp_googletest) +list(PREPEND pros xp_googletest) # make googletest first find_program(XVFB_RUN_EXEC xvfb-run) if(XVFB_RUN_EXEC) set(xvfb_cmd ${XVFB_RUN_EXEC}) From 45ec70d2ca5b0110e5ba7de97a4bef1fb43f385f Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 21 May 2026 16:45:52 -0600 Subject: [PATCH 2/3] test: extend VS2026 wxx test skip to future versions Change MSVC_VERSION check from VERSION_EQUAL to VERSION_GREATER_EQUAL to skip wxx_test on VS2026 and all future Visual Studio versions due to the known hang issue. --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1bbdd92..1299de6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -79,7 +79,7 @@ foreach(pro ${pros}) target_compile_definitions(${pro}_test PRIVATE ${${pro}_compile_definitions}) list(APPEND all_compile_definitions ${${pro}_compile_definitions}) endif() - if(pro STREQUAL "wxx" AND MSVC_VERSION VERSION_EQUAL 1950) + if(pro STREQUAL "wxx" AND MSVC_VERSION VERSION_GREATER_EQUAL 1950) message(STATUS "Skipping wxx_test on VS2026 (MSVC_VERSION 1950) due to known hang issue") elseif(pro STREQUAL "wxx" AND XVFB_RUN_EXEC) add_test(NAME ${pro}_test COMMAND ${XVFB_RUN_EXEC} -a From 5b17dd6c67e6ec90d71b316ee2f07d4ae862cfa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 21 May 2026 22:51:15 +0000 Subject: [PATCH 3/3] externpro 26.01.1-28-ga16d3d9 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index e3220ab..a16d3d9 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit e3220ab439d4475eb9bb6b9a9c84919ba63d095e +Subproject commit a16d3d9b36c91d09d247bb6d1392b5ec007031d6