diff options
| author | Jose <jose@zeroc.com> | 2017-06-20 10:25:47 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-20 10:25:47 +0200 |
| commit | ed7eb88f21d31737bdbcf57e65cc8f5408998ba3 (patch) | |
| tree | c54b96d15b0a09ce38b453e80349268b8b704083 /scripts/IceBridgeUtil.py | |
| parent | Fix (ICE-8112) Missing dependency for bridge test on Windows (diff) | |
| download | ice-ed7eb88f21d31737bdbcf57e65cc8f5408998ba3.tar.bz2 ice-ed7eb88f21d31737bdbcf57e65cc8f5408998ba3.tar.xz ice-ed7eb88f21d31737bdbcf57e65cc8f5408998ba3.zip | |
Fix (ICE-8117) - Windows IceBridge/simple test failure
Diffstat (limited to 'scripts/IceBridgeUtil.py')
| -rw-r--r-- | scripts/IceBridgeUtil.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/scripts/IceBridgeUtil.py b/scripts/IceBridgeUtil.py index aaed04ffdfc..8c0fefc81f8 100644 --- a/scripts/IceBridgeUtil.py +++ b/scripts/IceBridgeUtil.py @@ -11,8 +11,20 @@ from Util import * class IceBridge(ProcessFromBinDir, Server): - processType = "icebridge" + def __init__(self, *args, **kargs): + Server.__init__(self, "icebridge", mapping=Mapping.getByName("cpp"), desc="IceBridge", *args, **kargs) -class IceBridgeAdmin(ProcessFromBinDir, Client): + def getProps(self, current): + props = Server.getProps(self, current); + props.update({ + 'Ice.Warn.Dispatch' : 0, + 'IceBridge.Target.Endpoints' : current.getTestEndpoint(0) + ":" + current.getTestEndpoint(0, "udp"), + 'IceBridge.Source.Endpoints' : current.getTestEndpoint(1) + ":" + current.getTestEndpoint(1, "udp"), + 'Ice.Admin.Endpoints' : current.getTestEndpoint(2, "tcp"), + 'Ice.Admin.InstanceName' : "IceBridge", - processType = "icebridgeadmin" + }) + del props['Ice.ThreadPool.Server.Size'] + del props['Ice.ThreadPool.Server.SizeMax'] + del props['Ice.ThreadPool.Server.SizeWarn'] + return props |