diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
| commit | 884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch) | |
| tree | 53d2123abf22042f827d0e83b6093cea038c3b3a /cpp/test/Ice/dispatcher/Collocated.cpp | |
| parent | Merge branch '3.6' (diff) | |
| download | ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.bz2 ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.xz ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.zip | |
Fixes for Bluetooth plug-ins.
Updates to testsuite to support Bluetooth and remote servers.
Diffstat (limited to 'cpp/test/Ice/dispatcher/Collocated.cpp')
| -rw-r--r-- | cpp/test/Ice/dispatcher/Collocated.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index e76bfa09b08..afa55d366ba 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/Collocated.cpp @@ -19,8 +19,8 @@ using namespace std; int run(int, char**, const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); - communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); + communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", getTestEndpoint(communicator, 1, "tcp")); communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); |