diff --git a/roottest/cling/dict/ROOT-8096/CMakeLists.txt b/roottest/cling/dict/ROOT-8096/CMakeLists.txt index 1728d8e6e7380..26526e3c9a9fc 100644 --- a/roottest/cling/dict/ROOT-8096/CMakeLists.txt +++ b/roottest/cling/dict/ROOT-8096/CMakeLists.txt @@ -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) + 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}/$/libROOT-8096.dll ${CMAKE_CURRENT_BINARY_DIR}/) diff --git a/roottest/cling/stl/dicts/CMakeLists.txt b/roottest/cling/stl/dicts/CMakeLists.txt index 63c00cae7513e..6241dcb3b2747 100644 --- a/roottest/cling/stl/dicts/CMakeLists.txt +++ b/roottest/cling/stl/dicts/CMakeLists.txt @@ -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() diff --git a/roottest/root/io/rootcint/sigbug/CMakeLists.txt b/roottest/root/io/rootcint/sigbug/CMakeLists.txt index c06217725de45..082935010c33d 100644 --- a/roottest/root/io/rootcint/sigbug/CMakeLists.txt +++ b/roottest/root/io/rootcint/sigbug/CMakeLists.txt @@ -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() diff --git a/roottest/root/io/tmpifile/CMakeLists.txt b/roottest/root/io/tmpifile/CMakeLists.txt index 63aca0daba6de..6092e826104f1 100644 --- a/roottest/root/io/tmpifile/CMakeLists.txt +++ b/roottest/root/io/tmpifile/CMakeLists.txt @@ -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 diff --git a/roottest/root/io/tmpifile/split.C b/roottest/root/io/tmpifile/split.C index 8f3fe4f0608b9..580aaa134f0da 100644 --- a/roottest/root/io/tmpifile/split.C +++ b/roottest/root/io/tmpifile/split.C @@ -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); } diff --git a/roottest/root/io/transient/base/CMakeLists.txt b/roottest/root/io/transient/base/CMakeLists.txt index 9e25133d0a366..9836a6a2177eb 100644 --- a/roottest/root/io/transient/base/CMakeLists.txt +++ b/roottest/root/io/transient/base/CMakeLists.txt @@ -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") diff --git a/roottest/root/meta/genreflex/ROOT-5768/CMakeLists.txt b/roottest/root/meta/genreflex/ROOT-5768/CMakeLists.txt index a306e3a68e3c0..f255089616020 100644 --- a/roottest/root/meta/genreflex/ROOT-5768/CMakeLists.txt +++ b/roottest/root/meta/genreflex/ROOT-5768/CMakeLists.txt @@ -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() \ No newline at end of file + 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()