Skip to content

Commit e8519e4

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 47f5f99 commit e8519e4

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
@@ -264,9 +264,6 @@ macro(ROOTTEST_COMPILE_MACRO filename)
264264
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY FAIL_REGULAR_EXPRESSION "Warning in")
265265
endif()
266266
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
267-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
268-
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY RUN_SERIAL true)
269-
endif()
270267
if (ARG_FIXTURES_SETUP)
271268
set_property(TEST ${COMPILE_MACRO_TEST} PROPERTY
272269
FIXTURES_SETUP ${ARG_FIXTURES_SETUP})
@@ -370,9 +367,6 @@ macro(ROOTTEST_GENERATE_DICTIONARY dictname)
370367
-- ${always-make})
371368
372369
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
373-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
374-
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY RUN_SERIAL true)
375-
endif()
376370
377371
if (ARG_FIXTURES_SETUP)
378372
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY
@@ -487,9 +481,6 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
487481
-- ${always-make})
488482
489483
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
490-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
491-
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY RUN_SERIAL true)
492-
endif()
493484
494485
if (ARG_FIXTURES_SETUP)
495486
set_property(TEST ${GENERATE_REFLEX_TEST} PROPERTY
@@ -609,10 +600,6 @@ macro(ROOTTEST_GENERATE_EXECUTABLE executable)
609600
RESOURCE_LOCK ${ARG_RESOURCE_LOCK})
610601
endif()
611602
612-
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
613-
set_property(TEST ${GENERATE_EXECUTABLE_TEST} PROPERTY RUN_SERIAL true)
614-
endif()
615-
616603
if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
617604
add_custom_command(TARGET ${executable} POST_BUILD
618605
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${executable}.exe

0 commit comments

Comments
 (0)