diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-10-31 10:13:18 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-31 10:13:18 +0100 |
commit | 5633fd2618ac7ab588cc195964cc08763854b464 (patch) | |
tree | 9e81935a23239976be793d5ea2565843bd90111d /scripts/IceGridAdmin.py | |
parent | Another fix for UDP multicast IPv6 test (diff) | |
download | ice-5633fd2618ac7ab588cc195964cc08763854b464.tar.bz2 ice-5633fd2618ac7ab588cc195964cc08763854b464.tar.xz ice-5633fd2618ac7ab588cc195964cc08763854b464.zip |
Fixed ICE-5807: IceGrid/simple --ipv6 test failure
Diffstat (limited to 'scripts/IceGridAdmin.py')
-rw-r--r-- | scripts/IceGridAdmin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index e5b998a43bb..6be258a8c28 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -60,7 +60,7 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.DefaultTemplates="' + \ os.path.abspath(os.path.join(TestUtil.toplevel, "cpp", "config", "templates.xml") + '"') -if TestUtil.ipv6: +if TestUtil.ipv6 and TestUtil.isDarwin(): registryOptions += r' --IceGrid.Registry.Discovery.Interface="::1"' def getDefaultLocatorProperty(): |