Skip to content

Commit 1170977

Browse files
committed
Avoid UUID conflicts when running with boost 1.83.0
Apparently something broke and now we get all the UUIDs to be the same.
1 parent b572cbe commit 1170977

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

DataFormats/MemoryResources/test/testMemoryResources.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int testData::nconstructions = 0;
4747

4848
BOOST_AUTO_TEST_CASE(transportallocatormap_test)
4949
{
50-
size_t session{fair::mq::tools::UuidHash()};
50+
size_t session{(size_t)getpid() * 1000};
5151
fair::mq::ProgOptions config;
5252
config.SetProperty<std::string>("session", std::to_string(session));
5353

@@ -64,7 +64,7 @@ using namespace boost::container::pmr;
6464

6565
BOOST_AUTO_TEST_CASE(allocator_test)
6666
{
67-
size_t session{fair::mq::tools::UuidHash()};
67+
size_t session{(size_t)getpid() * 1000 + 1};
6868
fair::mq::ProgOptions config;
6969
config.SetProperty<std::string>("session", std::to_string(session));
7070

@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(allocator_test)
102102

103103
BOOST_AUTO_TEST_CASE(getMessage_test)
104104
{
105-
size_t session{fair::mq::tools::UuidHash()};
105+
size_t session{(size_t)getpid() * 1000 + 2};
106106
fair::mq::ProgOptions config;
107107
config.SetProperty<std::string>("session", std::to_string(session));
108108

@@ -154,7 +154,7 @@ BOOST_AUTO_TEST_CASE(getMessage_test)
154154

155155
BOOST_AUTO_TEST_CASE(adoptVector_test)
156156
{
157-
size_t session{fair::mq::tools::UuidHash()};
157+
size_t session{(size_t)getpid() * 1000 + 3};
158158
fair::mq::ProgOptions config;
159159
config.SetProperty<std::string>("session", std::to_string(session));
160160

Framework/Core/test/test_FairMQ.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ auto forEach(fair::mq::Parts& parts, F&& function)
100100

101101
TEST_CASE("getMessage_Stack")
102102
{
103-
size_t session{fair::mq::tools::UuidHash()};
103+
size_t session{(size_t)getpid() * 1000 + 0};
104104
fair::mq::ProgOptions config;
105105
config.SetProperty<std::string>("session", std::to_string(session));
106106

@@ -149,7 +149,7 @@ TEST_CASE("getMessage_Stack")
149149

150150
TEST_CASE("addDataBlockForEach_test")
151151
{
152-
size_t session{fair::mq::tools::UuidHash()};
152+
size_t session{(size_t)getpid() * 1000 + 1};
153153
fair::mq::ProgOptions config;
154154
config.SetProperty<std::string>("session", std::to_string(session));
155155

0 commit comments

Comments
 (0)