summaryrefslogtreecommitdiff
path: root/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-02-13 08:59:20 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-02-13 08:59:20 +0100
commitfb9c2da45abe7b3187121bc28e7d2fb47c1a1023 (patch)
tree58e467fa5a26e27061295b7fb973459993247acc /cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
parentFixed ICE-4931 - Ctrl-C handler causing SEGFAULT on OpenSUSE/gcc 4.7 (diff)
downloadice-fb9c2da45abe7b3187121bc28e7d2fb47c1a1023.tar.bz2
ice-fb9c2da45abe7b3187121bc28e7d2fb47c1a1023.tar.xz
ice-fb9c2da45abe7b3187121bc28e7d2fb47c1a1023.zip
Fixed WinRT IPv6 test configuration to match TestUtil.py configuration
Diffstat (limited to 'cpp/test/WinRT/TestSuite/MainPage.xaml.cpp')
-rw-r--r--cpp/test/WinRT/TestSuite/MainPage.xaml.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
index e20769e27a7..626f73178b5 100644
--- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
+++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
@@ -126,7 +126,6 @@ public:
// be set to the IP addresse of the host running the SSL
// server.
//
- args.push_back("--Ice.Default.Host=127.0.0.1");
args.push_back("--Ice.NullHandleAbort=1");
args.push_back("--Ice.Warn.Connections=1");
//args.push_back("--Ice.Trace.Network=2");
@@ -140,7 +139,15 @@ public:
if(_config.ipv6)
{
args.push_back("--Ice.Default.Host=0:0:0:0:0:0:0:1");
+ args.push_back("--Ice.IPv4=1");
args.push_back("--Ice.IPv6=1");
+ args.push_back("--Ice.PreferIPv6Address=1");
+ }
+ else
+ {
+ args.push_back("--Ice.Default.Host=127.0.0.1");
+ args.push_back("--Ice.IPv4=1");
+ args.push_back("--Ice.IPv6=0");
}
if(_config.type != TestConfigTypeClient)