Test: compare complete file and do not abort early
This commit is contained in:
1 parent
b5b4ea8d5a
commit
bcefce8313
1 file changed
+11
-9
@@ -232,6 +232,8 @@ bool compareVectors(TVectorD& baseline, TVectorD& candidate, const std::string&
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (argc!=3) {
|
||||
std::cerr<<"usage: musrRootOutputCompare <baseline.root> <candidate.root>\n";
|
||||
return 2;
|
||||
@@ -241,14 +243,14 @@ int main(int argc, char** argv)
|
||||
std::unique_ptr<TFile> candidate(TFile::Open(argv[2],"READ"));
|
||||
if (!baseline || baseline->IsZombie() || !candidate || candidate->IsZombie()) {
|
||||
std::cerr<<"could not open both ROOT files\n";
|
||||
return 2;
|
||||
ret = 2;
|
||||
}
|
||||
|
||||
const auto baselineKeys = describeKeys(*baseline);
|
||||
const auto candidateKeys = describeKeys(*candidate);
|
||||
if (baselineKeys!=candidateKeys) {
|
||||
std::cerr<<"ROOT key inventory differs\n";
|
||||
return 1;
|
||||
ret = 1;
|
||||
}
|
||||
|
||||
for (const auto& key : baselineKeys) {
|
||||
@@ -257,28 +259,28 @@ int main(int argc, char** argv)
|
||||
auto* candidateObject = candidate->Get(path.c_str());
|
||||
if (!baselineObject || !candidateObject) {
|
||||
std::cerr<<path<<": could not read both objects\n";
|
||||
return 2;
|
||||
ret = 2;
|
||||
}
|
||||
|
||||
if (auto* baselineTree = dynamic_cast<TTree*>(baselineObject)) {
|
||||
auto* candidateTree = dynamic_cast<TTree*>(candidateObject);
|
||||
if (!candidateTree || !compareTrees(*baselineTree,*candidateTree,path)) return 1;
|
||||
if (!candidateTree || !compareTrees(*baselineTree,*candidateTree,path)) ret = 1;
|
||||
}
|
||||
else if (auto* baselineHistogram = dynamic_cast<TH1*>(baselineObject)) {
|
||||
auto* candidateHistogram = dynamic_cast<TH1*>(candidateObject);
|
||||
if (!candidateHistogram ||
|
||||
!compareHistograms(*baselineHistogram,*candidateHistogram,path)) return 1;
|
||||
!compareHistograms(*baselineHistogram,*candidateHistogram,path)) ret = 1;
|
||||
}
|
||||
else if (auto* baselineVector = dynamic_cast<TVectorD*>(baselineObject)) {
|
||||
auto* candidateVector = dynamic_cast<TVectorD*>(candidateObject);
|
||||
if (!candidateVector || !compareVectors(*baselineVector,*candidateVector,path)) return 1;
|
||||
if (!candidateVector || !compareVectors(*baselineVector,*candidateVector,path)) ret = 1;
|
||||
}
|
||||
else {
|
||||
std::cerr<<path<<": unsupported ROOT object class "<<key.className<<'\n';
|
||||
return 2;
|
||||
ret = 2;
|
||||
}
|
||||
}
|
||||
|
||||
std::cout<<"ROOT outputs are exactly equal\n";
|
||||
return 0;
|
||||
if (ret == 0) std::cout<<"ROOT outputs are exactly equal\n";
|
||||
return ret;
|
||||
}
|
||||
Reference in new issue
Block a user