summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-04-11 18:06:58 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-04-11 18:06:58 +0200
commitdbff9a34d9c9966c882be07324ba65a50a49bf11 (patch)
tree6eee4e8943182f2c674f940aec7036b0b8972739 /cpp/test
parentRename getEngineVersion -> getOpenSSLVersion, remove getEngineName (diff)
downloadice-dbff9a34d9c9966c882be07324ba65a50a49bf11.tar.bz2
ice-dbff9a34d9c9966c882be07324ba65a50a49bf11.tar.xz
ice-dbff9a34d9c9966c882be07324ba65a50a49bf11.zip
Speed up binding test on Unix platforms
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Ice/binding/AllTests.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp
index 645cb5fe47c..8846dba22e2 100644
--- a/cpp/test/Ice/binding/AllTests.cpp
+++ b/cpp/test/Ice/binding/AllTests.cpp
@@ -242,11 +242,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
adapters.push_back(com->createObjectAdapter("AdapterRandom14", "default"));
adapters.push_back(com->createObjectAdapter("AdapterRandom15", "default"));
-#ifdef _WIN32
int count = 20;
-#else
- int count = 60;
-#endif
int adapterCount = static_cast<int>(adapters.size());
while(--count > 0)
{
@@ -256,17 +252,15 @@ allTests(const Ice::CommunicatorPtr& communicator)
com->deactivateObjectAdapter(adapters[4]);
--adapterCount;
}
- vector<TestIntfPrxPtr> proxies;
- proxies.resize(10);
#else
- if(count < 60 && count % 10 == 0)
+ if(count < 20 && count % 4 == 0)
{
- com->deactivateObjectAdapter(adapters[count / 10 - 1]);
+ com->deactivateObjectAdapter(adapters[count / 4 - 1]);
--adapterCount;
}
- vector<TestIntfPrxPtr> proxies;
- proxies.resize(40);
#endif
+ vector<TestIntfPrxPtr> proxies;
+ proxies.resize(10);
unsigned int i;
for(i = 0; i < proxies.size(); ++i)
{