Fixes for Bluetooth plug-ins.

Updates to testsuite to support Bluetooth and remote servers.

2 files changed, 14 insertions, 4 deletions

diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java
index 6bb7d874993..60e586e20de 100644
--- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java
+++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java
@@ -183,7 +183,7 @@ public class ControllerServer extends Ice.Application
 
         @Override
         public ServerPrx runServer(String lang, final String name, String protocol, String host,
-                                   boolean winrt, String[] options, Ice.Current current)
+                                   boolean winrt, String configName, String[] options, Ice.Current current)
         {
             if(_server != null)
             {
@@ -204,14 +204,23 @@ public class ControllerServer extends Ice.Application
             args.add("--server");
             args.add("--protocol");
             args.add(protocol);
-            args.add("--host");
-            args.add(host);
+            if(!host.isEmpty())
+            {
+                args.add("--host");
+                args.add(host);
+            }
 
             if(winrt)
             {
                 args.add("--winrt");
             }
 
+            if(!configName.isEmpty())
+            {
+                args.add("--configName");
+                args.add(configName);
+            }
+
             for(String option : options)
             {
                 args.add("--arg");
diff --git a/java/test/controller/src/main/slice/Controller.ice b/java/test/controller/src/main/slice/Controller.ice
index 7e4c2b95eda..5178df68660 100644
--- a/java/test/controller/src/main/slice/Controller.ice
+++ b/java/test/controller/src/main/slice/Controller.ice
@@ -29,7 +29,8 @@ sequence<string> StringSeq;
 
 interface Controller
 {
-    Server* runServer(string lang, string name, string protocol, string host, bool winrt, StringSeq options);
+    Server* runServer(string lang, string name, string protocol, string host, bool winrt, string configName,
+                      StringSeq options);
 };
 
 };