Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-16 10:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix parallel running tests failure

Browse Source
This commit is contained in:
Alexey Rybalchenko
2016-07-11 10:58:30 +02:00
parent 64f1fd2a3b
commit 13a5cea1d7
7 changed files with 101 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fairmq/test/pub-sub/runTestSub.cxx
View File

@@ -21,13 +21,23 @@ int main(int argc, char** argv)
{
FairMQTestSub testSub;
testSub.CatchSignals();
if (argc == 2)
std::string transport;
if (argc != 2)
{
testSub.SetTransport(argv[1]);
LOG(ERROR) << "Transport for the test not specified!";
return 1;
}
transport = argv[1];
if (transport == "zeromq" || transport == "nanomsg")
{
testSub.SetTransport(transport);
}
else
{
testSub.SetTransport("zeromq");
LOG(ERROR) << "Incorrect transport requested! Expected 'zeromq' or 'nanomsg', found: " << transport;
return 1;
}
reinit_logger(false);
@@ -36,7 +46,7 @@ int main(int argc, char** argv)
testSub.SetProperty(FairMQTestSub::Id, "testSub_" + std::to_string(getpid()));
FairMQChannel controlChannel("push", "connect", "tcp://127.0.0.1:5555");
if (argc == 2)
if (transport == "nanomsg")
{
controlChannel.UpdateAddress("tcp://127.0.0.1:5755");
}
@@ -44,7 +54,7 @@ int main(int argc, char** argv)
testSub.fChannels["control"].push_back(controlChannel);
FairMQChannel subChannel("sub", "connect", "tcp://127.0.0.1:5556");
if (argc == 2)
if (transport == "nanomsg")
{
subChannel.UpdateAddress("tcp://127.0.0.1:5756");
}