summaryrefslogtreecommitdiff
path: root/scripts/tests
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-02-21 17:40:09 +0100
committerJose <jose@zeroc.com>2018-02-21 17:40:09 +0100
commitab8b7a7f0f228bf1fed5cd428cdcf4d795c6a520 (patch)
treedadb4c21166e7a7e6550f0b68382083436564a3d /scripts/tests
parentAdditional Android fixes (diff)
downloadice-ab8b7a7f0f228bf1fed5cd428cdcf4d795c6a520.tar.bz2
ice-ab8b7a7f0f228bf1fed5cd428cdcf4d795c6a520.tar.xz
ice-ab8b7a7f0f228bf1fed5cd428cdcf4d795c6a520.zip
Fix ami test script to run collocated test only if available
Diffstat (limited to 'scripts/tests')
-rw-r--r--scripts/tests/Ice/ami.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/tests/Ice/ami.py b/scripts/tests/Ice/ami.py
index c89436f0da9..d886932a7c7 100644
--- a/scripts/tests/Ice/ami.py
+++ b/scripts/tests/Ice/ami.py
@@ -15,9 +15,10 @@ traceProps = {
"Ice.Trace.Protocol" : 1
}
-TestSuite(__name__,
- [
- ClientServerTestCase(traceProps=traceProps),
- CollocatedTestCase()
- ],
+testcases = [ ClientServerTestCase(traceProps=traceProps) ]
+
+if Mapping.getByPath(__name__).hasSource("Ice/ami", "collocated"):
+ testcases += [ CollocatedTestCase() ]
+
+TestSuite(__name__, testcases,
options = { "compress" : [False], "serialize" : [False] })