Skip to content

externpro 26.01.1-28-ga16d3d9 #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smanders merged 3 commits into from
May 21, 2026
Merged

externpro 26.01.1-28-ga16d3d9 #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bd7796
test: remove Threads from explicit test package order
smanders May 21, 2026
45ec70d
test: extend VS2026 wxx test skip to future versions
smanders May 21, 2026
5b17dd6
externpro 26.01.1-28-ga16d3d9
github-actions[bot] May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer
Open in desktop
Submodule .devcontainer updated 4 files
+5 −5 cmake/README.md
+10 −10 cmake/pros.cmake
+1 −0 cmake/xpdeps.cmake.in
+7 −2 cmake/xpfunmac.cmake
6 changes: 3 additions & 3 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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
Expand Down
Loading