summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/operations/Client.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-11-30 16:28:07 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-11-30 16:28:07 +0100
commit7095fda336eee32fb65895a21d756f59f1c15bb6 (patch)
tree5b4f43c6eaac49e15ad5fdd50aeab0ef171df928 /cpp/test/Ice/operations/Client.cpp
parentRemoved Java controller, fixes to investiage IceGrid/replication test failure (diff)
downloadice-7095fda336eee32fb65895a21d756f59f1c15bb6.tar.bz2
ice-7095fda336eee32fb65895a21d756f59f1c15bb6.tar.xz
ice-7095fda336eee32fb65895a21d756f59f1c15bb6.zip
Removed RemoteConfig to fix build failure
Diffstat (limited to 'cpp/test/Ice/operations/Client.cpp')
-rw-r--r--cpp/test/Ice/operations/Client.cpp26
1 files changed, 10 insertions, 16 deletions
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)
{