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/operations/Twoways.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/operations/Twoways.cpp')
| -rw-r--r-- | cpp/test/Ice/operations/Twoways.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 50711ad105e..dce362937ca 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -1575,7 +1575,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) } #ifndef ICE_OS_WINRT - if(p->ice_getConnection()) + if(p->ice_getConnection() && communicator->getProperties()->getProperty("Ice.Default.Protocol") != "bt") { // // Test implicit context propagation @@ -1596,7 +1596,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) ctx["three"] = "THREE"; Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, - ic->stringToProxy("test:default -p 12010 -t 10000")); + ic->stringToProxy("test:" + getTestEndpoint(ic, 0))); ic->getImplicitContext()->setContext(ctx); test(ic->getImplicitContext()->getContext() == ctx); |