From dba8d1ed9240d6bd5bd22b2b2ca0fd808074dc04 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Tue, 30 Dec 2025 13:43:19 +0100 Subject: [PATCH 1/3] [tut] Simplify example --- tutorials/visualisation/graphics/formula1.C | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tutorials/visualisation/graphics/formula1.C b/tutorials/visualisation/graphics/formula1.C index e4c19b83afc16..720c544daaaeb 100644 --- a/tutorials/visualisation/graphics/formula1.C +++ b/tutorials/visualisation/graphics/formula1.C @@ -26,9 +26,5 @@ void formula1() c1->SetGridy(); fun1->Draw(); c1->Update(); - // - // Before leaving this demo, we print the list of objects known to ROOT - // - if (gObjectTable) - gObjectTable->Print(); + } From ef46c22c6345148af4357945be6ed21b82aa86fe Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Tue, 30 Dec 2025 13:44:07 +0100 Subject: [PATCH 2/3] [test] Adapt autocompletion reference based on classes availability --- core/rint/test/CMakeLists.txt | 4 +-- core/rint/test/TTabComTests.cxx | 50 ++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/core/rint/test/CMakeLists.txt b/core/rint/test/CMakeLists.txt index b961e567eb192..4518dae395996 100644 --- a/core/rint/test/CMakeLists.txt +++ b/core/rint/test/CMakeLists.txt @@ -4,8 +4,6 @@ # For the licensing terms see $ROOTSYS/LICENSE. # For the list of contributors see $ROOTSYS/README/CREDITS. -if(NOT minimal) - ROOT_ADD_GTEST(TTabComTests TTabComTests.cxx LIBRARIES Rint) -endif() +ROOT_ADD_GTEST(TTabComTests TTabComTests.cxx LIBRARIES Rint) ROOT_ADD_GTEST(TRintTests TRintTests.cxx LIBRARIES Rint) diff --git a/core/rint/test/TTabComTests.cxx b/core/rint/test/TTabComTests.cxx index bd945995a3813..3a90e49aa6f5e 100644 --- a/core/rint/test/TTabComTests.cxx +++ b/core/rint/test/TTabComTests.cxx @@ -18,6 +18,7 @@ #include #include "TTabCom.h" +#include "TSystem.h" #include "gtest/gtest.h" @@ -61,17 +62,41 @@ static std::string GetCompletions(const std::string& pattern, std::setLoad("libGed")) { + expected += " TH1Editor"; + } + } + expected += " TH1F TH1I TH1L TH1S"; ASSERT_STREQ(expected.c_str(), GetCompletions("TH1").c_str()); } @@ -91,19 +116,4 @@ TEST(TTabComTests, CompleteTProfile) " TProfile2Poly TProfile2PolyBin TProfile3D"; ASSERT_STREQ(expected.c_str(), GetCompletions("TProfile").c_str()); -} - -TEST(TTabComTests, CompleteTObj) -{ - #ifdef R__USE_CXXMODULES - std::string expected = "TObjArray TObjArrayIter TObjLink TObjLinkPtr_t TObjOptLink" - " TObjString TObject TObjectRefSpy TObjectSpy TObjectTable"; - #else - std::string expected = "TObjArray TObjArrayIter TObjLink TObjOptLink" - " TObjString TObject TObjectRefSpy TObjectSpy TObjectTable"; - #endif - // FIXME: See ROOT-10989 - ASSERT_STREQ(expected.c_str(), GetCompletions("TObj", - /*ignore=*/{"TObjectDisplayItem", "TObjectDrawable", "TObjectHolder", - "TObjectItem", "TObjectElement", "TObject::EDeprecatedStatusBits", "TObject::EStatusBits"}).c_str()); -} +} \ No newline at end of file From 952024c9d7fe75f3c955a652c670a435df579c13 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Tue, 30 Dec 2025 13:44:57 +0100 Subject: [PATCH 3/3] [test] Exclude test relying on GUIs if GUIs are not available for example in the case of minimal builds. --- roottest/root/meta/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roottest/root/meta/CMakeLists.txt b/roottest/root/meta/CMakeLists.txt index b098cfe794a29..f7bded827b134 100644 --- a/roottest/root/meta/CMakeLists.txt +++ b/roottest/root/meta/CMakeLists.txt @@ -89,7 +89,7 @@ ROOTTEST_ADD_TEST(hello_ROOT_C OUTREF hello_ROOT_C_${libsuf}.ref FIXTURES_REQUIRED root-meta-hello_ROOT-fixture) -if(NOT minimal) +if(TARGET Gui) ROOTTEST_ADD_TEST(optionList MACRO optionList.cxx) endif()