Skip to content

[roottest] Fix build races #20883

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

Open
hahnjo wants to merge 4 commits into
base: master
Choose a base branch
from
+39 −10
Open

[roottest] Fix build races #20883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bbdabd
[roottest] Add missing modifiers when building AtlasLikeDataVector
hahnjo Jan 14, 2026
0125c4b
[roottest] Add RESOURCE_LOCK for build tests
hahnjo Jan 14, 2026
6ed1b80
[roottest] Fix TMPIFile macro
hahnjo Jan 14, 2026
06ad3dc
[roottest] Transform PRECMD into fixture test
hahnjo Jan 14, 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
4 changes: 4 additions & 0 deletions roottest/cling/dict/ROOT-8096/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ add_test(NAME roottest-cling-dict-ROOT-8096-build
-- ${always-make})
# --target ${targetname_libgen}${fast})
set_property(TEST roottest-cling-dict-ROOT-8096-build PROPERTY ENVIRONMENT ${ROOTTEST_ENVIRONMENT})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
Copy link
Member

@bellenot bellenot Jan 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear to me if the AND NOT MSVC part is really needed. I guess I'll have to try

set_property(TEST roottest-cling-dict-ROOT-8096-build APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST roottest-cling-dict-ROOT-8096-build APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()

if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
set(load_precmd ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/libROOT-8096.dll ${CMAKE_CURRENT_BINARY_DIR}/)
Expand Down
4 changes: 4 additions & 0 deletions roottest/cling/stl/dicts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ ROOTTEST_LINKER_LIBRARY(stldictTest TEST MyClass1.cpp MyClass2.cpp MyClass3.cpp
# of targets. Doing so right now would build the dictionaries twice.
ROOT_ADD_TEST(roottest-cling-stl-dicts-build
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} ${build_config} --target stldictTest${fast} -- ${always-make})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST roottest-cling-stl-dicts-build APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST roottest-cling-stl-dicts-build APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()
4 changes: 4 additions & 0 deletions roottest/root/io/rootcint/sigbug/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ add_test(NAME ${GENERATE_DICTIONARY_TEST}
${build_config}
--target ${dictname}${fast}
-- ${always-make})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST ${GENERATE_DICTIONARY_TEST} APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST ${GENERATE_DICTIONARY_TEST} APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()
4 changes: 4 additions & 0 deletions roottest/root/io/tmpifile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ ROOTTEST_ADD_TEST(split-fail

ROOTTEST_ADD_TEST(libjetevent-build
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} ${build_config} --target JetEvent${fast} -- ${always-make})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST roottest-root-io-tmpifile-libjetevent-build APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST roottest-root-io-tmpifile-libjetevent-build APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()

ROOTTEST_ADD_TEST(sync-rate
COPY_TO_BUILDDIR sync_rate.C
Expand Down
8 changes: 1 addition & 7 deletions roottest/root/io/tmpifile/split.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
void split()
{
try
{
TMPIFile *newfile = new TMPIFile("test_split.root", "RECREATE", 2);
} catch(const std::exception&)
{
return EXIT_FAILURE;
}
TMPIFile *newfile = new TMPIFile("test_split.root", "RECREATE", 2);
}
13 changes: 12 additions & 1 deletion roottest/root/io/transient/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,24 @@ set(CMAKE_ROOTTEST_NOROOTMAP OFF)
ROOT_GENERATE_DICTIONARY(base_cling ${CMAKE_CURRENT_SOURCE_DIR}/base.h MODULE base LINKDEF baseLinkDef.h)
ROOTTEST_LINKER_LIBRARY(base base_cling.cxx testobject.cpp testobjectderived.cpp TEST LIBRARIES ROOT::Core ROOT::RIO)

add_test(NAME roottest-root-io-transient-base-build
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}
${build_config}
--target base${fast}
-- ${always-make})
set_property(TEST roottest-root-io-transient-base-build PROPERTY FIXTURES_SETUP root-io-transient-base-build)
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST roottest-root-io-transient-base-build APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST roottest-root-io-transient-base-build APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()

ROOTTEST_ADD_TEST(WriteFile
COPY_TO_BUILDDIR testobject.h testobjectderived.h
PRECMD ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} ${build_config} --target base${fast}
MACRO execWriteFile.cxx+
ROOTEXE_OPTS -e "(void)gSystem->Load(\"libbase\")"
OUTREF execWriteFile${ref_suffix}
TIMEOUT 600
FIXTURES_REQUIRED root-io-transient-base-build
FIXTURES_SETUP root-io-transient-base-WriteFile-fixture)

if(${compression_default} STREQUAL "lz4")
Expand Down
6 changes: 5 additions & 1 deletion roottest/root/meta/genreflex/ROOT-5768/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@ if(NOT MSVC OR win_broken_tests)
ROOTTEST_ADD_TEST(PyCoolLib-build
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} ${build_config} --target PyCoolLib${fast} -- ${always-make}
FIXTURES_REQUIRED PyCool-reflex-dict)
endif()
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST roottest-root-meta-genreflex-ROOT-5768-PyCoolLib-build APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST roottest-root-meta-genreflex-ROOT-5768-PyCoolLib-build APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()
endif()
6 changes: 5 additions & 1 deletion roottest/root/ntuple/atlas-datavector/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ add_dependencies(${ATLASLIKEDATAVECTOR_LIB} ${ATLASLIKEDATAVECTOR_DICTNAME})

add_test(NAME ${GENERATE_DICTIONARY_TEST}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}
--target ${ATLASLIKEDATAVECTOR_DICTNAME} ${ATLASLIKEDATAVECTOR_LIB})
--target ${ATLASLIKEDATAVECTOR_DICTNAME}${fast} ${ATLASLIKEDATAVECTOR_LIB}${fast} -- ${always-make})
if(CMAKE_GENERATOR MATCHES Ninja AND NOT MSVC)
set_property(TEST ${GENERATE_DICTIONARY_TEST} APPEND PROPERTY RESOURCE_LOCK NINJA_BUILD)
set_property(TEST ${GENERATE_DICTIONARY_TEST} APPEND PROPERTY FIXTURES_REQUIRED NINJA_BUILD_ALL)
endif()
set_property(TEST ${GENERATE_DICTIONARY_TEST} PROPERTY FIXTURES_SETUP atlas_datavector_dict_setup)

# Generate an executable to write an RNTuple with a field of type
Expand Down
Loading