diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
| commit | d81701ca8182942b7936f9fd84a019b695e9c890 (patch) | |
| tree | dc036c9d701fbbe1afad67782bd78572c0f61974 /cpp/test/WinRT/TestSuite/MainPage.xaml.cpp | |
| parent | Fixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff) | |
| download | ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2 ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip | |
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'cpp/test/WinRT/TestSuite/MainPage.xaml.cpp')
| -rw-r--r-- | cpp/test/WinRT/TestSuite/MainPage.xaml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp index eb1daf78bce..5daab0e7d0f 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp @@ -353,7 +353,6 @@ struct TestCase static const TestCase allTest[] = { TestCase("Ice", "adapterDeactivation", "client.dll", "server.dll", 0, "collocated.dll"), - TestCase("Ice", "adapterDeactivation", "client.dll", "server.dll", 0, "collocated.dll"), TestCase("Ice", "ami", "client.dll", "server.dll", 0, 0), TestCase("Ice", "binding", "client.dll", "server.dll", 0, 0), TestCase("Ice", "dispatcher", "client.dll", "server.dll", 0, 0), @@ -370,6 +369,7 @@ static const TestCase allTest[] = TestCase("Ice", "retry", "client.dll", "server.dll", 0, 0), TestCase("Ice", "stream", "client.dll", 0, 0, 0), TestCase("Ice", "timeout", "client.dll", "server.dll", 0, 0), + TestCase("Ice", "acm", "client.dll", "server.dll", 0, 0), TestCase("Ice", "udp", "client.dll", "server.dll", 0, 0), TestCase("Ice", "hash", "client.dll", 0, 0, 0), TestCase("Ice", "metrics", "client.dll", "server.dll", "serveramd.dll", 0), @@ -471,8 +471,8 @@ public: svrConfig.type = TestConfigTypeServer; serverRunable = new Runnable(_test.prefix + server, svrConfig); serverRunable->start(); - serverRunable->waitForStart(); serverRunable->getThreadControl().detach(); + serverRunable->waitForStart(); } TestConfig cltConfig = _config; |