Skip to content

[test] Avoid using GetRootSys() in unit tests #20807

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
guitargeek merged 3 commits into from
Jan 6, 2026
Merged

[test] Avoid using GetRootSys() in unit tests #20807

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
594e832
[RF][HF] Remove fallback in testHistFactory to lookup inputs in ROOTSYS
guitargeek Jan 6, 2026
02a9c2e
[test] Avoid adding unneeded extra interpreter args in some tests
guitargeek Jan 6, 2026
59c9d82
[test] Don't repeatedly include `<vector>` header in stressInterpreter
guitargeek Jan 6, 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
17 changes: 7 additions & 10 deletions roofit/histfactory/test/testHistFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ TEST(HistFactory, Read_ROOT6_16_Model)

std::string filename = "./ref_6.16_example_UsingC_channel1_meas_model.root";
std::unique_ptr<TFile> file(TFile::Open(filename.c_str()));
if (!file || !file->IsOpen()) {
filename = TROOT::GetRootSys() + "/roofit/histfactory/test/" + filename;
file.reset(TFile::Open(filename.c_str()));
}

ASSERT_TRUE(file && file->IsOpen());
RooWorkspace *ws;
Expand All @@ -118,10 +114,6 @@ TEST(HistFactory, Read_ROOT6_16_Combined_Model)

std::string filename = "./ref_6.16_example_UsingC_combined_meas_model.root";
std::unique_ptr<TFile> file(TFile::Open(filename.c_str()));
if (!file || !file->IsOpen()) {
filename = TROOT::GetRootSys() + "/roofit/histfactory/test/" + filename;
file.reset(TFile::Open(filename.c_str()));
}

ASSERT_TRUE(file && file->IsOpen());
RooWorkspace *ws;
Expand All @@ -143,7 +135,12 @@ TEST(HistFactory, Read_ROOT6_16_Combined_Model)

/// What kind of model is set up. Use this to instantiate
/// a test suite.
enum class MakeModelMode { OverallSyst, HistoSyst, StatSyst, ShapeSyst };
enum class MakeModelMode {
OverallSyst,
HistoSyst,
StatSyst,
ShapeSyst
};

using HFTestParam = std::tuple<MakeModelMode, bool, RooFit::EvalBackend>;

Expand Down Expand Up @@ -695,7 +692,7 @@ INSTANTIATE_TEST_SUITE_P(
HistFactory, HFFixture,
testing::Combine(testing::Values(MakeModelMode::OverallSyst, MakeModelMode::HistoSyst, MakeModelMode::StatSyst,
MakeModelMode::ShapeSyst),
testing::Values(false, true), // non-uniform bins or not
testing::Values(false, true), // non-uniform bins or not
testing::Values(RooFit::EvalBackend::Cpu())), // dummy because no NLL is created
[](testing::TestParamInfo<HFFixture::ParamType> const &paramInfo) { return getName(paramInfo.param, true); });

Expand Down
3 changes: 0 additions & 3 deletions test/bench.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ template <class TGen> TBenchData runTest(const char *name, int nevents, int nhit

int main(int argc, char **argv)
{
std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
TROOT::AddExtraInterpreterArgs({inclRootSys});

bool writereferences = false;
bool memberwise = false;
bool shortrun = false;
Expand Down
3 changes: 0 additions & 3 deletions test/stress.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ void cleanup();

int main(int argc, char **argv)
{
std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
TROOT::AddExtraInterpreterArgs({inclRootSys});

gROOT->SetBatch();
TApplication theApp("App", &argc, argv);
gBenchmark = new TBenchmark();
Expand Down
3 changes: 0 additions & 3 deletions test/stressIOPlugins.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ void cleanup();

int main(int argc, char **argv)
{
std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
TROOT::AddExtraInterpreterArgs({inclRootSys});

gROOT->SetBatch();
TApplication theApp("App", &argc, argv);
const char *proto = 0;
Expand Down
3 changes: 1 addition & 2 deletions test/stressInterpreter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ bool InterpreterStress::stressSTLDict() {
int res = 3;
TInterpreter::EErrorCode interpError = TInterpreter::kNoError;
TString cmd
= TString::Format("#include <vector>\n"
"class MyClass;\n"
= TString::Format("class MyClass;\n"
"typedef MyClass* Klass%d_t;\n"
"std::vector<Klass%d_t> v%d;\n"
"void stressInterpreter_tmp%d() {\n"
Expand Down
3 changes: 0 additions & 3 deletions test/stressMathCore.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,9 +1563,6 @@ int stressMathCore(double nscale = 1) {


int main(int argc,const char *argv[]) {
std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
TROOT::AddExtraInterpreterArgs({inclRootSys});

double nscale = 1;
if (argc > 1) {
nscale = atof(argv[1]);
Expand Down
Loading