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/acm/Client.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/acm/Client.cpp')
-rw-r--r-- | cpp/test/Ice/acm/Client.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/test/Ice/acm/Client.cpp b/cpp/test/Ice/acm/Client.cpp index df4130472ec..70cb93bf97c 100644 --- a/cpp/test/Ice/acm/Client.cpp +++ b/cpp/test/Ice/acm/Client.cpp @@ -15,7 +15,6 @@ DEFINE_TEST("client") using namespace std; - int run(int, char**, const Ice::CommunicatorPtr& communicator) { @@ -29,14 +28,22 @@ main(int argc, char* argv[]) { #ifdef ICE_STATIC_LIBS Ice::registerIceSSL(); +# if defined(__linux) + Ice::registerIceBT(); +# endif #endif + try { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.Connections", "0"); + Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData); - return run(argc, argv, ich.communicator()); + RemoteConfig rc("Ice/acm", argc, argv, ich.communicator()); + int status = run(argc, argv, ich.communicator()); + rc.finished(status); + return status; } catch(const Ice::Exception& ex) { |