diff options
| author | Jose <jose@zeroc.com> | 2018-02-05 08:34:31 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-02-05 08:34:31 +0100 |
| commit | 5b1531275cc5553cc728eecbfa91a89fcd9305b3 (patch) | |
| tree | 2f98bbd478344806766d1322155ee5a4f5e2794b /scripts/tests | |
| parent | Fixes to support zeroc.icebuilder.msbuild tasks (diff) | |
| parent | Fixed PHP array initialization in test proxy client (diff) | |
| download | ice-5b1531275cc5553cc728eecbfa91a89fcd9305b3.tar.bz2 ice-5b1531275cc5553cc728eecbfa91a89fcd9305b3.tar.xz ice-5b1531275cc5553cc728eecbfa91a89fcd9305b3.zip | |
Merge remote-tracking branch 'origin/3.7' into netcore
Diffstat (limited to 'scripts/tests')
| -rw-r--r-- | scripts/tests/Ice/metrics.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/tests/Ice/metrics.py b/scripts/tests/Ice/metrics.py index d2ece8de332..35b3634f074 100644 --- a/scripts/tests/Ice/metrics.py +++ b/scripts/tests/Ice/metrics.py @@ -14,8 +14,14 @@ traceProps = { "Ice.Trace.Retry" : 1, "Ice.Trace.Protocol" : 1 } +testcases = [ + ClientServerTestCase(traceProps=traceProps), +] +if Mapping.getByPath(__name__).hasSource("Ice/metrics", "serveramd"): + testcases += [ ClientAMDServerTestCase(traceProps=traceProps) ] +if Mapping.getByPath(__name__).hasSource("Ice/metrics", "collocated"): + testcases += [ CollocatedTestCase(traceProps=traceProps) ] -TestSuite(__name__, - [ClientServerTestCase(traceProps=traceProps)], +TestSuite(__name__, testcases, options = { "ipv6" : [False], "compress": [False], "protocol" : ["tcp", "ssl"] }, multihost=False) |