From 2920a892a5db1c24bb8af34c63aacc1438a18247 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 28 Jun 2026 16:54:54 +0200 Subject: [PATCH 1/3] [core] The old TUUID constructor can create either version 1 or 3 Do not fail test if version 3 is returned. --- core/base/test/UUIDTest.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/base/test/UUIDTest.cxx b/core/base/test/UUIDTest.cxx index dea3700052bac..c834223f6d0e0 100644 --- a/core/base/test/UUIDTest.cxx +++ b/core/base/test/UUIDTest.cxx @@ -14,7 +14,7 @@ TEST(TUUID, UUIDv4) EXPECT_EQ(10000u, uuids.size()); TUUID u; - EXPECT_EQ('1', u.AsString()[14]); + EXPECT_TRUE('1' == u.AsString()[14] || '3' == u.AsString()[14]); u = TUUID::UUIDv4(); std::string str = u.AsString(); EXPECT_EQ('4', str[14]); From 58b38e29586975e714deee6ac195b286eb9a73cf Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 28 Jun 2026 16:59:36 +0200 Subject: [PATCH 2/3] [tree][df] Do not fail test on 32 bit due to mis-aligned atomic --- tree/dataframe/test/dataframe_hist.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/tree/dataframe/test/dataframe_hist.cxx b/tree/dataframe/test/dataframe_hist.cxx index f5fe396b50de3..7a2c6659a845e 100644 --- a/tree/dataframe/test/dataframe_hist.cxx +++ b/tree/dataframe/test/dataframe_hist.cxx @@ -31,6 +31,7 @@ class RDFHist : public ::testing::TestWithParam { RDFHist() { fDiag.optionalDiag(kWarning, "", "Filling RHist is experimental", /*matchFullMessage=*/false); + fDiag.optionalDiag(kWarning, "cling", "expected alignment (8 bytes) exceeds the actual alignment (4 bytes) [-Watomic-alignment]", false); if (GetParam()) ROOT::EnableImplicitMT(4); } From 07cbb0515e4f45808696037adce7c0f1bc5e903d Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 28 Jun 2026 17:01:40 +0200 Subject: [PATCH 3/3] [tree][nt] Compare size to the size of the struct Do not assume it is 2 * sizeof(double), which is not true on 32 bit. --- tree/ntuple/test/ntuple_modelext.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tree/ntuple/test/ntuple_modelext.cxx b/tree/ntuple/test/ntuple_modelext.cxx index 8ec3886f9216d..ef27e844e84a1 100644 --- a/tree/ntuple/test/ntuple_modelext.cxx +++ b/tree/ntuple/test/ntuple_modelext.cxx @@ -810,12 +810,12 @@ TEST(RNTuple, ModelExtensionRecordNested) modelUpdater->AddField(std::make_unique>("ptHP"), "r1.r2.r3.r4"); modelUpdater->CommitUpdate(); - EXPECT_EQ(2 * sizeof(double), writer->GetModel().GetConstField("r1").GetValueSize()); - entry = writer->CreateEntry(); struct FloatAndDouble { float pt; double ptHP; }; + EXPECT_EQ(sizeof(FloatAndDouble), writer->GetModel().GetConstField("r1").GetValueSize()); + entry = writer->CreateEntry(); auto ptrFloatAndDouble = static_cast(entry->GetPtr("r1").get()); ptrFloatAndDouble->pt = 2.0;