Skip to content

Commit 7f214a8

Browse files
committed
[roottest] Remove sequential compilation with Ninja.
Roottest tests were compiled sequentially when Ninja was in use, to avoid a problem (the commit doesn't mention details). Since that was 8 years ago, we should give parallel Ninja another try.
1 parent b789237 commit 7f214a8

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

roottest/cmake/modules/RoottestMacros.cmake

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,6 @@ macro(ROOTTEST_COMPILE_MACRO filename)
263263
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY FAIL_REGULAR_EXPRESSION "Warning in")
264264
endif()
265265
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
266-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
267-
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY RUN_SERIAL true)
268-
endif()
269266
if (ARG_FIXTURES_SETUP)
270267
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY
271268
FIXTURES_SETUP ${ARG_FIXTURES_SETUP})
@@ -384,9 +381,6 @@ macro(ROOTTEST_GENERATE_DICTIONARY dictname)
384381
-- ${always-make})
385382
386383
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
387-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
388-
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY RUN_SERIAL true)
389-
endif()
390384
391385
if (ARG_FIXTURES_SETUP)
392386
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY
@@ -501,9 +495,6 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
501495
-- ${always-make})
502496
503497
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
504-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
505-
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY RUN_SERIAL true)
506-
endif()
507498
508499
if (ARG_FIXTURES_SETUP)
509500
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY
@@ -623,10 +614,6 @@ macro(ROOTTEST_GENERATE_EXECUTABLE executable)
623614
RESOURCE_LOCK ${ARG_RESOURCE_LOCK})
624615
endif()
625616
626-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
627-
set_property(TEST ${GENERATE_EXECUTABLE_TEST} PROPERTY RUN_SERIAL true)
628-
endif()
629-
630617
if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
631618
add_custom_command(TARGET ${executable} POST_BUILD
632619
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${executable}.exe

0 commit comments

Comments
 (0)