summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-07-18 23:41:25 +0200
committerJose <jose@zeroc.com>2017-07-18 23:41:25 +0200
commit0266eb2f9234e5349275720218ba8c6d7699ef88 (patch)
treed247c447c062679357add95ceeaca4c3469157c2
parentFix ICE-8357 (diff)
downloadice-0266eb2f9234e5349275720218ba8c6d7699ef88.tar.bz2
ice-0266eb2f9234e5349275720218ba8c6d7699ef88.tar.xz
ice-0266eb2f9234e5349275720218ba8c6d7699ef88.zip
Glacier2 test static build fixes
-rw-r--r--cpp/test/Glacier2/application/Client.cpp4
-rw-r--r--cpp/test/Glacier2/application/Server.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp
index eb7531996bd..155379a9969 100644
--- a/cpp/test/Glacier2/application/Client.cpp
+++ b/cpp/test/Glacier2/application/Client.cpp
@@ -113,6 +113,10 @@ public:
int
main(int argc, char* argv[])
{
+#ifdef ICE_STATIC_LIBS
+ Ice::registerIceSSL(false);
+ Ice::registerIceWS(true);
+#endif
Application app;
Ice::InitializationData initData = getTestInitData(argc, argv);
initData.properties->setProperty("Ice.Warn.Connections", "0");
diff --git a/cpp/test/Glacier2/application/Server.cpp b/cpp/test/Glacier2/application/Server.cpp
index 21b63dbb2cf..54062b1edbb 100644
--- a/cpp/test/Glacier2/application/Server.cpp
+++ b/cpp/test/Glacier2/application/Server.cpp
@@ -63,6 +63,10 @@ Server::run(int, char**)
int
main(int argc, char* argv[])
{
+#ifdef ICE_STATIC_LIBS
+ Ice::registerIceSSL(false);
+ Ice::registerIceWS(true);
+#endif
Server app;
Ice::InitializationData initData = getTestInitData(argc, argv);
return app.main(argc, argv, initData);