Skip to content

Revert "[CMake] Never force RUN_SERIAL in roottest when using Ninja" #19779

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
merged 1 commit into from
Sep 1, 2025
Merged

Revert "[CMake] Never force RUN_SERIAL in roottest when using Ninja" #19779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2367,6 +2367,9 @@ macro(ROOTTEST_COMPILE_MACRO filename)
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY FAIL_REGULAR_EXPRESSION "Warning in")
endif()
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY RUN_SERIAL true)
endif()
if (ARG_FIXTURES_SETUP)
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY
FIXTURES_SETUP ${ARG_FIXTURES_SETUP})
Expand Down Expand Up @@ -2469,6 +2472,9 @@ macro(ROOTTEST_GENERATE_DICTIONARY dictname)
-- ${always-make})

set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY RUN_SERIAL true)
endif()

if (ARG_FIXTURES_SETUP)
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY
Expand Down Expand Up @@ -2582,6 +2588,9 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
-- ${always-make})

set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY RUN_SERIAL true)
endif()

if (ARG_FIXTURES_SETUP)
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY
Expand Down Expand Up @@ -2702,6 +2711,10 @@ macro(ROOTTEST_GENERATE_EXECUTABLE executable)
RESOURCE_LOCK ${ARG_RESOURCE_LOCK})
endif()

if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST ${GENERATE_EXECUTABLE_TEST} PROPERTY RUN_SERIAL true)
endif()

if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
add_custom_command(TARGET ${executable} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${executable}.exe
Expand Down
Loading