diff --git a/core/rint/test/CMakeLists.txt b/core/rint/test/CMakeLists.txt index 4518dae395996..b961e567eb192 100644 --- a/core/rint/test/CMakeLists.txt +++ b/core/rint/test/CMakeLists.txt @@ -4,6 +4,8 @@ # For the licensing terms see $ROOTSYS/LICENSE. # For the list of contributors see $ROOTSYS/README/CREDITS. -ROOT_ADD_GTEST(TTabComTests TTabComTests.cxx LIBRARIES Rint) +if(NOT minimal) + ROOT_ADD_GTEST(TTabComTests TTabComTests.cxx LIBRARIES Rint) +endif() ROOT_ADD_GTEST(TRintTests TRintTests.cxx LIBRARIES Rint) diff --git a/roottest/root/meta/CMakeLists.txt b/roottest/root/meta/CMakeLists.txt index 374e7e48947d3..b098cfe794a29 100644 --- a/roottest/root/meta/CMakeLists.txt +++ b/roottest/root/meta/CMakeLists.txt @@ -89,4 +89,9 @@ ROOTTEST_ADD_TEST(hello_ROOT_C OUTREF hello_ROOT_C_${libsuf}.ref FIXTURES_REQUIRED root-meta-hello_ROOT-fixture) +if(NOT minimal) + ROOTTEST_ADD_TEST(optionList + MACRO optionList.cxx) +endif() + ROOTTEST_ADD_TESTDIRS() diff --git a/roottest/root/meta/execOptionList.ref b/roottest/root/meta/execOptionList.ref deleted file mode 100644 index f96ba793d08e9..0000000000000 --- a/roottest/root/meta/execOptionList.ref +++ /dev/null @@ -1,3 +0,0 @@ - -Processing execOptionList.cxx+... -(int) 0 diff --git a/roottest/root/meta/execOptionList.cxx b/roottest/root/meta/optionList.cxx similarity index 97% rename from roottest/root/meta/execOptionList.cxx rename to roottest/root/meta/optionList.cxx index 08bd40d588fd1..401a611e4f486 100644 --- a/roottest/root/meta/execOptionList.cxx +++ b/roottest/root/meta/optionList.cxx @@ -19,7 +19,7 @@ int check(TDataMember *d, UInt_t i, const char *name, Long_t expected) { } } -int execOptionList() { +int optionList() { gSystem->Setenv("DISPLAY",""); // Avoid spurrious warning when libGui is loaded. auto c = TClass::GetClass("TGTextEntry"); diff --git a/roottest/root/multicore/CMakeLists.txt b/roottest/root/multicore/CMakeLists.txt index 182e5f94f9758..c2ccd37e85757 100644 --- a/roottest/root/multicore/CMakeLists.txt +++ b/roottest/root/multicore/CMakeLists.txt @@ -52,17 +52,18 @@ ROOTTEST_ADD_TEST(SequentialExecutor FIXTURES_REQUIRED root-multicore-tSequentialExecutor-fixture) if(NOT MSVC AND NOT dev) - ROOTTEST_GENERATE_EXECUTABLE(processExecutorH1Test - tProcessExecutorH1Test.cpp - COMPILE_FLAGS "-I${ROOTSYS}/tutorials/legacy/multicore" - LIBRARIES ROOT::MultiProc ROOT::Core ROOT::Net ROOT::TreePlayer ROOT::Tree ROOT::RIO ROOT::Hist ROOT::Gpad ROOT::Graf - FIXTURES_SETUP root-multicore-processExecutorH1Test-fixture) - - ROOTTEST_ADD_TEST(processExecutorH1Test - EXEC ${CMAKE_CURRENT_BINARY_DIR}/processExecutorH1Test - OUTREF tProcessExecutorH1Test.ref - FIXTURES_REQUIRED root-multicore-processExecutorH1Test-fixture) - + if(xrootd) + ROOTTEST_GENERATE_EXECUTABLE(processExecutorH1Test + tProcessExecutorH1Test.cpp + COMPILE_FLAGS "-I${ROOTSYS}/tutorials/legacy/multicore" + LIBRARIES ROOT::MultiProc ROOT::Core ROOT::Net ROOT::TreePlayer ROOT::Tree ROOT::RIO ROOT::Hist ROOT::Gpad ROOT::Graf + FIXTURES_SETUP root-multicore-processExecutorH1Test-fixture) + + ROOTTEST_ADD_TEST(processExecutorH1Test + EXEC ${CMAKE_CURRENT_BINARY_DIR}/processExecutorH1Test + OUTREF tProcessExecutorH1Test.ref + FIXTURES_REQUIRED root-multicore-processExecutorH1Test-fixture) + endif() ROOTTEST_GENERATE_EXECUTABLE(processExecutorTreeTest tProcessExecutorTreeTest.cpp LIBRARIES MultiProc Core Net TreePlayer Tree RIO Hist diff --git a/roottest/root/ntuple/atlas-datavector/CMakeLists.txt b/roottest/root/ntuple/atlas-datavector/CMakeLists.txt index df95a119cdff2..baabe5ce7241d 100644 --- a/roottest/root/ntuple/atlas-datavector/CMakeLists.txt +++ b/roottest/root/ntuple/atlas-datavector/CMakeLists.txt @@ -78,15 +78,17 @@ ROOTTEST_ADD_TEST(read # instantiation done by the Python bindings was leading to a faulty behaviour: # the user-provided class template "AtlasLikeDataVector" does not # correspond to what the compiler sees, so we need to inject this information. -ROOT_ADD_PYUNITTEST( - rentry_getptr - rentry_getptr.py - GENERIC - PYTHON_DEPS pytest - FIXTURES_REQUIRED atlas_datavector_write_done) +if(ROOT_pyroot_FOUND) + ROOT_ADD_PYUNITTEST( + rentry_getptr + rentry_getptr.py + GENERIC + PYTHON_DEPS pytest + FIXTURES_REQUIRED atlas_datavector_write_done) -ROOT_ADD_PYUNITTEST( - template_instantiation - template_instantiation.py - GENERIC - PYTHON_DEPS pytest) + ROOT_ADD_PYUNITTEST( + template_instantiation + template_instantiation.py + GENERIC + PYTHON_DEPS pytest) +endif() diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt index 4320a5104be84..2d85b07aede4f 100644 --- a/tutorials/CMakeLists.txt +++ b/tutorials/CMakeLists.txt @@ -423,6 +423,12 @@ else() list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C) endif() +#---These do not run with minimal +if(minimal) + set(minimal_veto visualisation/graphics/formula1.C) # relies on unstable ROOT::Detail::HasBeenDeleted +endif() + + #---These ones are disabled !!! ------------------------------------ set(extra_veto legacy/benchmarks.C @@ -514,6 +520,7 @@ set(all_veto hsimple.C ${spectrum_veto} ${dataframe_veto} ${davix_veto} + ${minimal_veto} ) file(GLOB_RECURSE tutorials RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.C)