Fixes for Bluetooth plug-ins.

Updates to testsuite to support Bluetooth and remote servers.

1 files changed, 8 insertions, 2 deletions

diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp
index 78de0c13009..28b4bf917ec 100644
--- a/cpp/test/Ice/ami/Client.cpp
+++ b/cpp/test/Ice/ami/Client.cpp
@@ -28,6 +28,9 @@ main(int argc, char* argv[])
 {
 #ifdef ICE_STATIC_LIBS
     Ice::registerIceSSL();
+#   if defined(__linux)
+    Ice::registerIceBT();
+#   endif
 #endif
 
     try
@@ -43,11 +46,14 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.TCP.SndSize", "50000");
 
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
+        RemoteConfig rc("Ice/ami", argc, argv, ich.communicator());
+        int status = run(argc, argv, ich.communicator());
+        rc.finished(status);
+        return status;
     }
     catch(const Ice::Exception& ex)
     {
         cerr << ex << endl;
-        return  EXIT_FAILURE;
+        return EXIT_FAILURE;
     }
 }