summaryrefslogtreecommitdiff
path: root/scripts/tests/Ice/objects.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-12-01 10:37:29 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-12-01 10:37:29 +0100
commite4adfe8b0ebb24d9d5b55e00706cd6fa40d10bcc (patch)
treebdc2b8e919497c7223b8e6c42f16c5458cecf6f8 /scripts/tests/Ice/objects.py
parentFixes to test PHP in Windows (diff)
downloadice-e4adfe8b0ebb24d9d5b55e00706cd6fa40d10bcc.tar.bz2
ice-e4adfe8b0ebb24d9d5b55e00706cd6fa40d10bcc.tar.xz
ice-e4adfe8b0ebb24d9d5b55e00706cd6fa40d10bcc.zip
Added collocated testcase for Ice/objects and exceptions
Diffstat (limited to 'scripts/tests/Ice/objects.py')
-rw-r--r--scripts/tests/Ice/objects.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/tests/Ice/objects.py b/scripts/tests/Ice/objects.py
index fef2b3fb6cb..d11092609db 100644
--- a/scripts/tests/Ice/objects.py
+++ b/scripts/tests/Ice/objects.py
@@ -7,8 +7,14 @@
#
# **********************************************************************
-TestSuite(__name__, [
+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" }),
-]) \ No newline at end of file
+]
+
+if Mapping.getByPath(__name__).hasSource("Ice/objects", "collocated"):
+ testcases += [ CollocatedTestCase() ]
+
+TestSuite(__name__, testcases)
+