Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +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

18
fairmq/test/req-rep/runTestRep.cxx
View File

@@ -21,13 +21,23 @@ int main(int argc, char** argv)
{
FairMQTestRep testRep;
testRep.CatchSignals();
if (argc == 2)
std::string transport;
if (argc != 2)
{
testRep.SetTransport(argv[1]);
LOG(ERROR) << "Transport for the test not specified!";
return 1;
}
transport = argv[1];
if (transport == "zeromq" || transport == "nanomsg")
{
testRep.SetTransport(transport);
}
else
{
testRep.SetTransport("zeromq");
LOG(ERROR) << "Incorrect transport requested! Expected 'zeromq' or 'nanomsg', found: " << transport;
return 1;
}
reinit_logger(false);
@@ -35,7 +45,7 @@ int main(int argc, char** argv)
testRep.SetProperty(FairMQTestRep::Id, "testRep");
FairMQChannel repChannel("rep", "bind", "tcp://127.0.0.1:5558");
if (argc == 2)
if (transport == "nanomsg")
{
repChannel.UpdateAddress("tcp://127.0.0.1:5758");
}

18
fairmq/test/req-rep/runTestReq.cxx
View File

@@ -21,13 +21,23 @@ int main(int argc, char** argv)
{
FairMQTestReq testReq;
testReq.CatchSignals();
if (argc == 2)
std::string transport;
if (argc != 2)
{
testReq.SetTransport(argv[1]);
LOG(ERROR) << "Transport for the test not specified!";
return 1;
}
transport = argv[1];
if (transport == "zeromq" || transport == "nanomsg")
{
testReq.SetTransport(transport);
}
else
{
testReq.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)
testReq.SetProperty(FairMQTestReq::Id, "testReq" + std::to_string(getpid()));
FairMQChannel reqChannel("req", "connect", "tcp://127.0.0.1:5558");
if (argc == 2)
if (transport == "nanomsg")
{
reqChannel.UpdateAddress("tcp://127.0.0.1:5758");
}