diff options
| -rw-r--r-- | scripts/IceGridUtil.py | 3 | ||||
| -rw-r--r-- | scripts/tests/IceDiscovery/simple.py | 2 | ||||
| -rw-r--r-- | scripts/tests/IceGrid/simple.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index c981b63eaae..7af2d88383b 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -146,7 +146,6 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.Internal.Endpoints' : 'default', 'IceGrid.Registry.Client.Endpoints' : self.getEndpoints(current), 'IceGrid.Registry.Discovery.Port' : current.driver.getTestPort(99), - "IceGrid.Registry.Discovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", 'IceGrid.Registry.SessionManager.Endpoints' : 'default', 'IceGrid.Registry.AdminSessionManager.Endpoints' : 'default', 'IceGrid.Registry.SessionTimeout' : 60, @@ -161,6 +160,8 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.DefaultTemplates' : '"' + os.path.abspath(os.path.join(toplevel, "cpp", "config", "templates.xml")) + '"' } + if not isinstance(platform, Linux): + props["IceGrid.Registry.Discovery.Interface"] = "::1" if current.config.ipv6 else "127.0.0.1" return props def getEndpoints(self, current): diff --git a/scripts/tests/IceDiscovery/simple.py b/scripts/tests/IceDiscovery/simple.py index 4eab32122e4..e948e8d248b 100644 --- a/scripts/tests/IceDiscovery/simple.py +++ b/scripts/tests/IceDiscovery/simple.py @@ -11,7 +11,7 @@ props = lambda process, current: { "IceDiscovery.Timeout": 50, "IceDiscovery.RetryCount": 5, - "IceDiscovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", + "IceDiscovery.Interface": "" if isinstance(platform, Linux) else "::1" if current.config.ipv6 else "127.0.0.1", "IceDiscovery.Port": current.driver.getTestPort(10), "Ice.Plugin.IceDiscovery": current.getPluginEntryPoint("IceDiscovery", process) } diff --git a/scripts/tests/IceGrid/simple.py b/scripts/tests/IceGrid/simple.py index dc87a4a7f62..002ac0cf89b 100644 --- a/scripts/tests/IceGrid/simple.py +++ b/scripts/tests/IceGrid/simple.py @@ -20,7 +20,7 @@ registryProps = { clientProps = lambda process, current: { "IceLocatorDiscovery.Timeout": 50, "IceLocatorDiscovery.RetryCount": 5, - "IceLocatorDiscovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", + "IceLocatorDiscovery.Interface": "" if isinstance(platform, Linux) else "::1" if current.config.ipv6 else "127.0.0.1", "IceLocatorDiscovery.Port": current.driver.getTestPort(99), } |