diff options
| -rw-r--r-- | cpp/test/Ice/binding/AllTests.cpp | 14 | ||||
| -rw-r--r-- | java-compat/test/src/main/java/test/Ice/binding/AllTests.java | 19 | ||||
| -rw-r--r-- | java/test/src/main/java/test/Ice/binding/AllTests.java | 19 |
3 files changed, 12 insertions, 40 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) { diff --git a/java-compat/test/src/main/java/test/Ice/binding/AllTests.java b/java-compat/test/src/main/java/test/Ice/binding/AllTests.java index e639810dd37..c6cfc5f786f 100644 --- a/java-compat/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/binding/AllTests.java @@ -255,20 +255,11 @@ public class AllTests System.getProperty("os.name").startsWith("Windows") || System.getProperty("java.vendor").toLowerCase().indexOf("android") >= 0; - int count; - if(shortenTest) - { - count = 20; - } - else - { - count = 60; - } - + int count = 20; int adapterCount = adapters.length; while(--count > 0) { - TestIntfPrx[] proxies; + TestIntfPrx[] proxies = new TestIntfPrx[10]; if(shortenTest) { if(count == 1) @@ -276,16 +267,14 @@ public class AllTests com.deactivateObjectAdapter(adapters[4]); --adapterCount; } - proxies = new TestIntfPrx[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; } - proxies = new TestIntfPrx[40]; } int i; diff --git a/java/test/src/main/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java index 23733d443ce..2bc222828d6 100644 --- a/java/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java @@ -211,20 +211,11 @@ public class AllTests System.getProperty("os.name").startsWith("Windows") || System.getProperty("java.vendor").toLowerCase().indexOf("android") >= 0; - int count; - if(shortenTest) - { - count = 20; - } - else - { - count = 60; - } - + int count = 20; int adapterCount = adapters.length; while(--count > 0) { - TestIntfPrx[] proxies; + TestIntfPrx[] proxies = new TestIntfPrx[10]; if(shortenTest) { if(count == 1) @@ -232,16 +223,14 @@ public class AllTests rcom.deactivateObjectAdapter(adapters[4]); --adapterCount; } - proxies = new TestIntfPrx[10]; } else { - if(count < 60 && count % 10 == 0) + if(count < 20 && count % 4 == 0) { - rcom.deactivateObjectAdapter(adapters[count / 10 - 1]); + rcom.deactivateObjectAdapter(adapters[count / 4 - 1]); --adapterCount; } - proxies = new TestIntfPrx[40]; } int i; |