Fix for ICE-7125 - Added support for Ice.ClassGraphDepthMax

1 files changed, 17 insertions, 3 deletions

diff --git a/scripts/tests/Ice/objects.py b/scripts/tests/Ice/objects.py
index 3e77deee0a8..8f9460e3a27 100644
--- a/scripts/tests/Ice/objects.py
+++ b/scripts/tests/Ice/objects.py
@@ -7,10 +7,24 @@
 #
 # **********************************************************************
 
+#
+# Use a server stack size of 512KB, this is in particular important for Java
+# servers which don't implement Ice.ClassGraphDepthMax and which could cause
+# a client stack overflow if the client stack is too small compared to the
+# Java server stack.
+#
+class ObjectClientServerTestCase(ClientServerTestCase):
+
+    def getProps(self, process, current):
+        props = ClientServerTestCase.getProps(self, process, current)
+        if isinstance(process, Server) and not isinstance(process, EchoServer):
+            props["Ice.ThreadPool.Server.StackSize"] = 512 * 1024
+        return props
+
 testcases = [
-    ClientServerTestCase("client/server with compact format"),
-    ClientServerTestCase("client/server with sliced format", props={ "Ice.Default.SlicedFormat" : True }),
-    ClientServerTestCase("client/server with 1.0 encoding", props={ "Ice.Default.EncodingVersion" : "1.0" }),
+    ObjectClientServerTestCase("client/server with compact format"),
+    ObjectClientServerTestCase("client/server with sliced format", props = {"Ice.Default.SlicedFormat" : True}),
+    ObjectClientServerTestCase("client/server with 1.0 encoding", props = {"Ice.Default.EncodingVersion" : "1.0"}),
 ]
 
 if Mapping.getByPath(__name__).hasSource("Ice/objects", "collocated"):