a08fcbc5ad
ROOT now uses llvm/clang version 13 (updated from version 9) Clean up specfile by removing EPEL 7 conditionals Drop dataframe, roofit and tmva-sofieparser on EPEL 8 ppc64le due to "pure virtual method called" errors Split the root-geom sub-package into three separate sub-packages: root-geom, root-geom-builder and root-geom-painter Enable uring support in EPEL 9 (liburing now available) New sub-packages: root-geom-webviewer, root-roofit-jsoninterface, root-testsupport, root-tree-ntuple-utils, root-tree-webviewer, root-xroofit Dropped patches: 31 New patches: 17 Updated patches: 4
85 lines
3.4 KiB
Diff
85 lines
3.4 KiB
Diff
From 922290ebdc5e3363adfa82dd45208862bb01630a Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Wed, 8 Feb 2023 09:50:00 +0100
|
|
Subject: [PATCH] Fix build with -Dbuiltin_gtest:BOOL=OFF on EPEL 8
|
|
|
|
---
|
|
roofit/roofitcore/test/testRooBinSamplingPdf.cxx | 7 ++++++-
|
|
roofit/roofitcore/test/testRooProdPdf.cxx | 5 +++++
|
|
roofit/roofitcore/test/testRooRealIntegral.cxx | 5 +++++
|
|
roofit/roofitcore/test/testTestStatistics.cxx | 2 +-
|
|
4 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/roofit/roofitcore/test/testRooBinSamplingPdf.cxx b/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
|
|
index 823fef712f..116000f9f8 100644
|
|
--- a/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
|
|
+++ b/roofit/roofitcore/test/testRooBinSamplingPdf.cxx
|
|
@@ -13,6 +13,11 @@
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
+// Backward compatibility for gtest version < 1.10.0
|
|
+#ifndef INSTANTIATE_TEST_SUITE_P
|
|
+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
|
|
+#endif
|
|
+
|
|
#include <memory>
|
|
|
|
class ParamTest : public testing::TestWithParam<std::tuple<std::string>> {
|
|
@@ -123,7 +128,7 @@ TEST(RooBinSamplingPdf, CheckConsistentNormalization)
|
|
EXPECT_FLOAT_EQ(int2->getVal(), int3->getVal());
|
|
}
|
|
|
|
-INSTANTIATE_TEST_SUITE_P(RooBinSamplingPdf, ParamTest, testing::Combine(testing::Values("Off", "Cpu")),
|
|
+INSTANTIATE_TEST_SUITE_P(RooBinSamplingPdf, ParamTest, testing::Values("Off", "Cpu"),
|
|
[](testing::TestParamInfo<ParamTest::ParamType> const ¶mInfo) {
|
|
std::stringstream ss;
|
|
ss << "BatchMode" << std::get<0>(paramInfo.param);
|
|
diff --git a/roofit/roofitcore/test/testRooProdPdf.cxx b/roofit/roofitcore/test/testRooProdPdf.cxx
|
|
index 86bcf6eb48..d794fb415a 100644
|
|
--- a/roofit/roofitcore/test/testRooProdPdf.cxx
|
|
+++ b/roofit/roofitcore/test/testRooProdPdf.cxx
|
|
@@ -16,6 +16,11 @@
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
+// Backward compatibility for gtest version < 1.10.0
|
|
+#ifndef INSTANTIATE_TEST_SUITE_P
|
|
+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
|
|
+#endif
|
|
+
|
|
#include <memory>
|
|
#include <sstream>
|
|
#include <string>
|
|
diff --git a/roofit/roofitcore/test/testRooRealIntegral.cxx b/roofit/roofitcore/test/testRooRealIntegral.cxx
|
|
index c33c6ae138..0ab6ab973f 100644
|
|
--- a/roofit/roofitcore/test/testRooRealIntegral.cxx
|
|
+++ b/roofit/roofitcore/test/testRooRealIntegral.cxx
|
|
@@ -20,6 +20,11 @@
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
+// Backward compatibility for gtest version < 1.10.0
|
|
+#ifndef INSTANTIATE_TEST_SUITE_P
|
|
+#define INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
|
|
+#endif
|
|
+
|
|
#include <memory>
|
|
|
|
namespace {
|
|
diff --git a/roofit/roofitcore/test/testTestStatistics.cxx b/roofit/roofitcore/test/testTestStatistics.cxx
|
|
index dc20b4e1c9..1623637653 100644
|
|
--- a/roofit/roofitcore/test/testTestStatistics.cxx
|
|
+++ b/roofit/roofitcore/test/testTestStatistics.cxx
|
|
@@ -490,7 +490,7 @@ TEST_P(OffsetBinTest, CrossCheck)
|
|
EXPECT_NEAR(nllVal1, 0.0, 1e-8) << "NLL with bin offsetting is " << nllVal1 << ", and " << nllVal0 << " without it.";
|
|
}
|
|
|
|
-INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Combine(testing::Values("Off", "Cpu")),
|
|
+INSTANTIATE_TEST_SUITE_P(RooNLLVar, TestStatisticTest, testing::Values("Off", "Cpu"),
|
|
[](testing::TestParamInfo<TestStatisticTest::ParamType> const ¶mInfo) {
|
|
std::stringstream ss;
|
|
ss << "BatchMode" << std::get<0>(paramInfo.param);
|
|
--
|
|
2.39.1
|
|
|