Skip to content

A few minor fixes in roottest #20832

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
hageboeck merged 3 commits into from
Jan 13, 2026
+4 −2
Merged

A few minor fixes in roottest #20832

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
de9cc11
[roottest] Unset list of defines before adding new macro tests.
hageboeck Jan 9, 2026
d676bb4
[roottest] Fix an inconsistent override warning.
hageboeck Jan 9, 2026
90fa494
[roottest] Replace a function that doesn't exist.
hageboeck Jan 9, 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
1 change: 1 addition & 0 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,6 +2416,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)
# when using the scripts/build.C macro.
get_directory_property(DirDefs COMPILE_DEFINITIONS)

unset(RootMacroDirDefines)
foreach(d ${DirDefs})
if(d MATCHES "_WIN32" OR d MATCHES "_XKEYCHECK_H" OR d MATCHES "NOMINMAX")
continue()
Expand Down
3 changes: 2 additions & 1 deletion roottest/root/io/newstl/TestHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ class THelper : public Helper, public TObject {
public:
THelper() {};
explicit THelper(int v,double d) : Helper(v,d) {};
virtual const char* CompMsg(const Helper& icopy) const {
const char *CompMsg(const Helper &icopy) const override
{
const THelper *copy = dynamic_cast<const THelper*>(&icopy);
if (copy==0) return "Wrong type (expected THelper)\n";
return Form("THelper object wrote %d %g and read %d %g\n",val,dval,copy->val,copy->dval);
Expand Down
2 changes: 1 addition & 1 deletion roottest/root/io/newstl/readNoLib.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ int readNoLib(const char *fname = "vector.root")
dirname.ReplaceAll("/","-");

TString filename = fname;
gSystem->PrependFilePath(dirname, filename);
gSystem->PrependPathName(dirname, filename);

auto file0 = TFile::Open(filename);
if (!file0)
Expand Down
Loading