e663491f10
Rename the jupyroot and distrdf packages to reflect that they are now submodules of the main pyyhon package New subpackages: root-package graf3d-glad, root-package net-curl, root-package tmva-sofie-parser-python, root-package tree-ml, root-package histv7util Dropped patches: 2 New patches: 7
27 lines
857 B
Diff
27 lines
857 B
Diff
From 2920a892a5db1c24bb8af34c63aacc1438a18247 Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
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 dea3700052b..c834223f6d0 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]);
|
|
--
|
|
2.54.0
|
|
|