Skip to content

[testing] Do not exclude tests based on "minimal" flag but be more granular #20785

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

Merged
dpiparo merged 3 commits into from
Dec 31, 2025
Merged

[testing] Do not exclude tests based on "minimal" flag but be more granular #20785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dba8d1e
[tut] Simplify example
dpiparo Dec 30, 2025
ef46c22
[test] Adapt autocompletion reference based on classes availability
dpiparo Dec 30, 2025
952024c
[test] Exclude test relying on GUIs if GUIs are not available
dpiparo Dec 30, 2025
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: 1 addition & 3 deletions core/rint/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

50 changes: 30 additions & 20 deletions core/rint/test/TTabComTests.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <ROOT/RConfig.hxx>

#include "TTabCom.h"
#include "TSystem.h"

#include "gtest/gtest.h"

Expand Down Expand Up @@ -61,17 +62,41 @@ static std::string GetCompletions(const std::string& pattern, std::set<std::stri
return SortCompletions(oss.str(), ignore);
}

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 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());
}

TEST(TTabComTests, CompleteTH1)
{
// FIXME: The first call is unsuccessful due to a bug in the TTabCom::Hook
// on some systems.
GetCompletions("TH1");
std::string expected = "TH1 TH1C TH1D"
std::string expected = "TH1 TH1C TH1D";
#if defined(R__USE_CXXMODULES) && defined(R__HAS_DATAFRAME)
// FIXME: See ROOT-10989
" TH1DModel"
// FIXME: See ROOT-10989
expected += " TH1DModel";
#endif
" TH1Editor TH1F TH1I TH1L TH1S";

{
ROOT::TestSupport::CheckDiagsRAII diagRAII;
diagRAII.optionalDiag(kError, "", "libGed[.so | .dll | .dylib | .sl | .dl | .a] does not exist in", false);
if (0 == gSystem->Load("libGed")) {
expected += " TH1Editor";
}
}
expected += " TH1F TH1I TH1L TH1S";

ASSERT_STREQ(expected.c_str(), GetCompletions("TH1").c_str());
}
Expand All @@ -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());
}
}
2 changes: 1 addition & 1 deletion roottest/root/meta/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 1 addition & 5 deletions tutorials/visualisation/graphics/formula1.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

}
Loading