diff options
Diffstat (limited to 'cpp/test')
| -rwxr-xr-x | cpp/test/IceDiscovery/simple/run.py | 4 | ||||
| -rw-r--r-- | cpp/test/IceGrid/simple/AllTests.cpp | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cpp/test/IceDiscovery/simple/run.py b/cpp/test/IceDiscovery/simple/run.py index e48dd655664..5de3fedd862 100755 --- a/cpp/test/IceDiscovery/simple/run.py +++ b/cpp/test/IceDiscovery/simple/run.py @@ -27,6 +27,10 @@ num = 3 args = " --IceDiscovery.Timeout=50" args += " --IceDiscovery.RetryCount=5" +if not TestUtil.ipv6: + args += " --IceDiscovery.Interface=127.0.0.1" +elif TestUtil.isDarwin(): + args += " --IceDiscovery.Interface=\"::1\"" # Set the plugin property only for the server, the client uses Ice::registerIceDiscovery() serverArgs = " --Ice.Plugin.IceDiscovery=IceDiscovery:createIceDiscovery" + args diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp index c51673118e5..e2cd0bb95f9 100644 --- a/cpp/test/IceGrid/simple/AllTests.cpp +++ b/cpp/test/IceGrid/simple/AllTests.cpp @@ -67,6 +67,12 @@ allTests(const Ice::CommunicatorPtr& communicator) initData.properties = communicator->getProperties()->clone(); initData.properties->setProperty("Ice.Default.Locator", ""); initData.properties->setProperty("Ice.Plugin.IceLocatorDiscovery", "IceLocatorDiscovery:createIceLocatorDiscovery"); +#ifdef __APPLE__ + if(initData.properties->getPropertyAsInt("Ice.PreferIPv6Address") > 0) + { + initData.properties->setProperty("IceLocatorDiscovery.Interface", "::1"); + } +#endif initData.properties->setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter"); initData.properties->setProperty("AdapterForDiscoveryTest.Endpoints", "default"); |