7add16520d
Drop patches accepted upstream: root-fix-ppc64le-compilation-with-gcc-10.patch root-ppc-codemodel.patch root-ppc-segfault-fix.patch Drop the doxygen generated root-doc package (doxygen runs out of memory) Backport python 3.11 fixes from upstream Various test fixes - patches from the rawhide build Don't use yuicompressor on Fedora (Java no longer available on ix86) Backport locking of gInterpreterMutex in TClingClassInfo::IsEnum
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 2aa02353663674a338c92fa4e72a0c0e529c410e Mon Sep 17 00:00:00 2001
|
|
From: Enrico Guiraud <enrico.guiraud@cern.ch>
|
|
Date: Fri, 8 Apr 2022 17:52:18 +0200
|
|
Subject: [PATCH] [DF] Fix long int + Snapshot test on 32 bit platforms
|
|
|
|
Co-authored-by: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
---
|
|
tree/dataframe/test/dataframe_snapshot.cxx | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tree/dataframe/test/dataframe_snapshot.cxx b/tree/dataframe/test/dataframe_snapshot.cxx
|
|
index f41848e96a..ddbacaba0f 100644
|
|
--- a/tree/dataframe/test/dataframe_snapshot.cxx
|
|
+++ b/tree/dataframe/test/dataframe_snapshot.cxx
|
|
@@ -495,11 +495,14 @@ void ReadWriteCarray(const char *outFileNameBase)
|
|
t.Branch("vb", vb, "vb[size]/O");
|
|
t.Branch("vl", vl, "vl[size]/G");
|
|
|
|
+ // use 2**33 as a larger-than-int value on 64 bits, otherwise just something larger than short (2**30)
|
|
+ static constexpr long int longintTestValue = sizeof(long int) == 8 ? 8589934592 : 1073741824;
|
|
+
|
|
// Size 1
|
|
size = 1;
|
|
v[0] = 12;
|
|
vb[0] = true;
|
|
- vl[0] = 8589934592; // 2**33
|
|
+ vl[0] = longintTestValue;
|
|
t.Fill();
|
|
|
|
// Size 0 (see ROOT-9860)
|
|
@@ -546,7 +549,7 @@ void ReadWriteCarray(const char *outFileNameBase)
|
|
EXPECT_EQ(rvb.GetSize(), 1u);
|
|
EXPECT_TRUE(rvb[0]);
|
|
EXPECT_EQ(rvl.GetSize(), 1u);
|
|
- EXPECT_EQ(rvl[0], 8589934592);
|
|
+ EXPECT_EQ(rvl[0], longintTestValue);
|
|
|
|
// Size 0
|
|
EXPECT_TRUE(r.Next());
|
|
--
|
|
2.35.1
|
|
|