Removed RemoteConfig to fix build failure

17 files changed, 24 insertions, 184 deletions

diff --git a/cpp/test/Common/TestCommon.cpp b/cpp/test/Common/TestCommon.cpp
index e869c7fd0f4..ecdcba43d37 100644
--- a/cpp/test/Common/TestCommon.cpp
+++ b/cpp/test/Common/TestCommon.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <TestCommon.h>
-#include <Controller.h>
 
 #include <Ice/Communicator.h>
 
@@ -86,97 +85,3 @@ getTestInitData(int& argc, char* argv[])
     Ice::stringSeqToArgs(args, argc, argv);
     return initData;
 }
-
-RemoteConfig::RemoteConfig(const std::string& name, int argc, char** argv, const Ice::CommunicatorPtr& communicator) :
-    _status(1)
-{
-    //
-    // If ControllerHost is defined, we are using a server on a remote host. We expect a
-    // test controller will already be active. We let exceptions propagate out to
-    // the caller.
-    //
-    // Also look for a ConfigName property, which specifies the name of the configuration
-    // we are currently testing.
-    //
-    std::string controllerHost;
-    std::string configName;
-    for(int i = 1; i < argc; ++i)
-    {
-        std::string opt = argv[i];
-        if(opt.find("--ControllerHost") == 0)
-        {
-            std::string::size_type pos = opt.find('=');
-            if(pos != std::string::npos && opt.size() > pos + 1)
-            {
-                controllerHost = opt.substr(pos + 1);
-            }
-        }
-        else if(opt.find("--ConfigName") == 0)
-        {
-            std::string::size_type pos = opt.find('=');
-            if(pos != std::string::npos && opt.size() > pos + 1)
-            {
-                configName = opt.substr(pos + 1);
-            }
-        }
-    }
-
-    Test::Common::ServerPrxPtr server;
-
-    if(!controllerHost.empty())
-    {
-        std::string prot = communicator->getProperties()->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        std::string host;
-        if(prot != "bt")
-        {
-            host = communicator->getProperties()->getProperty("Ice.Default.Host");
-        }
-
-        Test::Common::StringSeq options;
-
-        Test::Common::ControllerPrxPtr controller = ICE_CHECKED_CAST(Test::Common::ControllerPrx,
-            communicator->stringToProxy("controller:tcp -h " + controllerHost + " -p 15000"));
-        server = controller->runServer("cpp", name, prot, host, false, configName, options);
-        server->waitForServer();
-    }
-
-    _server = server;
-}
-
-RemoteConfig::~RemoteConfig() ICE_NOEXCEPT_FALSE
-{
-    if(_server)
-    {
-        try
-        {
-            Test::Common::ServerPrxPtr server = ICE_UNCHECKED_CAST(Test::Common::ServerPrx, _server);
-            if(_status == 0)
-            {
-                server->waitTestSuccess();
-            }
-            else
-            {
-                server->terminate();
-            }
-        }
-        catch(const Ice::LocalException&)
-        {
-            if(_status == 0)
-            {
-                throw;
-            }
-        }
-    }
-}
-
-bool
-RemoteConfig::isRemote() const
-{
-    return _server != 0;
-}
-
-void
-RemoteConfig::finished(int status)
-{
-    _status = status;
-}
diff --git a/cpp/test/Ice/acm/Client.cpp b/cpp/test/Ice/acm/Client.cpp
index 50ff5687f93..4a0ad4acf99 100644
--- a/cpp/test/Ice/acm/Client.cpp
+++ b/cpp/test/Ice/acm/Client.cpp
@@ -1,7 +1,6 @@
 // **********************************************************************
 //
 // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-//
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
@@ -39,10 +38,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.Warn.Connections", "0");
 
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/acm", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp
index 660157236f5..18fb26c44bb 100644
--- a/cpp/test/Ice/ami/Client.cpp
+++ b/cpp/test/Ice/ami/Client.cpp
@@ -45,10 +45,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.TCP.SndSize", "50000");
 
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/ami", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/binding/Client.cpp b/cpp/test/Ice/binding/Client.cpp
index c9ea03062c5..0b89cb19ab3 100644
--- a/cpp/test/Ice/binding/Client.cpp
+++ b/cpp/test/Ice/binding/Client.cpp
@@ -37,10 +37,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/binding", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp
index 981c32ec106..a349a0416c6 100644
--- a/cpp/test/Ice/enums/Client.cpp
+++ b/cpp/test/Ice/enums/Client.cpp
@@ -39,10 +39,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/enums", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index ea868afb18a..2199ab31511 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -42,10 +42,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.MessageSizeMax", "10"); // 10KB max
 
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/exceptions", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index 94f9d76a1e0..3ba9b478f1d 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/Client.cpp
@@ -39,10 +39,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/facets", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp
index 3a74970a720..b14ee56c601 100644
--- a/cpp/test/Ice/hold/Client.cpp
+++ b/cpp/test/Ice/hold/Client.cpp
@@ -38,10 +38,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/hold", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index 6e44696210a..49be4b95431 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -39,10 +39,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/inheritance", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 5b93e93fddd..ed0aa56fc3e 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -163,10 +163,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/objects", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index a3d6e76cb4b..4d37a3e2eaa 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -16,25 +16,22 @@ DEFINE_TEST("client")
 using namespace std;
 
 int
-run(int, char**, const Ice::CommunicatorPtr& communicator, bool remote)
+run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
     Test::MyClassPrxPtr myClass = allTests(communicator);
 
 #ifndef ICE_OS_WINRT
     myClass->shutdown();
-    if(!remote)
+    cout << "testing server shutdown... " << flush;
+    try
+    {
+        myClass->opVoid();
+        test(false);
+    }
+    catch(const Ice::LocalException&)
     {
-        cout << "testing server shutdown... " << flush;
-        try
-        {
-            myClass->opVoid();
-            test(false);
-        }
-        catch(const Ice::LocalException&)
-        {
-            cout << "ok" << endl;
-        }
+        cout << "ok" << endl;
     }
 #else
     //
@@ -69,10 +66,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.BatchAutoFlushSize", "100");
 
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/operations", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator(), rc.isRemote());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/optional/Client.cpp b/cpp/test/Ice/optional/Client.cpp
index 7dc9b1c3ae7..8f04df5447b 100644
--- a/cpp/test/Ice/optional/Client.cpp
+++ b/cpp/test/Ice/optional/Client.cpp
@@ -39,10 +39,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/optional", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp
index 9ba427230dd..292eb49051c 100644
--- a/cpp/test/Ice/proxy/Client.cpp
+++ b/cpp/test/Ice/proxy/Client.cpp
@@ -40,10 +40,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/proxy", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/servantLocator/Client.cpp b/cpp/test/Ice/servantLocator/Client.cpp
index a3805686f23..04b038f518d 100644
--- a/cpp/test/Ice/servantLocator/Client.cpp
+++ b/cpp/test/Ice/servantLocator/Client.cpp
@@ -39,10 +39,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/servantLocator", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp
index 270e4e3e6b2..3ccf7e33d75 100644
--- a/cpp/test/Ice/slicing/exceptions/Client.cpp
+++ b/cpp/test/Ice/slicing/exceptions/Client.cpp
@@ -39,10 +39,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData = getTestInitData(argc, argv);
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/slicing/exceptions", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp
index 0b0b9cce780..f908d625f4c 100644
--- a/cpp/test/Ice/slicing/objects/Client.cpp
+++ b/cpp/test/Ice/slicing/objects/Client.cpp
@@ -44,10 +44,7 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.CollectObjects", "1");
 
         Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        RemoteConfig rc("Ice/slicing/objects", argc, argv, ich.communicator());
-        int status = run(argc, argv, ich.communicator());
-        rc.finished(status);
-        return status;
+        return run(argc, argv, ich.communicator());
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index acc3b8d2152..e41d75c9234 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -57,22 +57,6 @@ TEST_API std::string getTestHost(const Ice::PropertiesPtr&);
 TEST_API int getTestPort(const Ice::PropertiesPtr&, int);
 TEST_API Ice::InitializationData getTestInitData(int&, char*[]);
 
-class TEST_API RemoteConfig
-{
-public:
-
-    RemoteConfig(const std::string&, int, char**, const Ice::CommunicatorPtr&);
-    ~RemoteConfig() ICE_NOEXCEPT_FALSE;
-
-    bool isRemote() const;
-    void finished(int);
-
-private:
-
-    Ice::ObjectPrxPtr _server;
-    int _status;
-};
-
 #if !defined(ICE_OS_WINRT) && (TARGET_OS_IPHONE == 0)
 
 void