diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-10-01 16:27:11 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-10-01 16:27:11 -0230 |
| commit | 36a9c67e6a0832a50d64f39f5bfd328beb56e989 (patch) | |
| tree | efbf378ddba4c84aad86d3306b61d3c8b22fab3e /cpp | |
| parent | Fixed missing lib directory for RPATH on install of Py/Ruby/Php modules (diff) | |
| download | ice-36a9c67e6a0832a50d64f39f5bfd328beb56e989.tar.bz2 ice-36a9c67e6a0832a50d64f39f5bfd328beb56e989.tar.xz ice-36a9c67e6a0832a50d64f39f5bfd328beb56e989.zip | |
ICE-6767 Better handling of server start failure by test controller
Diffstat (limited to 'cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/test/TestSuite/10.0/Package.appxmanifest | 4 | ||||
| -rw-r--r-- | cpp/test/TestSuite/Controller.ice | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | cpp/test/TestSuite/MainPage.xaml.cpp | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/cpp/test/TestSuite/10.0/Package.appxmanifest b/cpp/test/TestSuite/10.0/Package.appxmanifest index c392fede467..92debdae674 100644..100755 --- a/cpp/test/TestSuite/10.0/Package.appxmanifest +++ b/cpp/test/TestSuite/10.0/Package.appxmanifest @@ -3,7 +3,7 @@ <Identity Name="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" Publisher="CN=jose" Version="1.0.0.0" /> <mp:PhoneIdentity PhoneProductId="f4c6cdff-3ef9-43fb-8094-d50c547e70f6" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <Properties> - <DisplayName>TestSuite</DisplayName> + <DisplayName>Ice Test Suite</DisplayName> <PublisherDisplayName>jose</PublisherDisplayName> <Logo>Assets\StoreLogo.png</Logo> </Properties> @@ -15,7 +15,7 @@ </Resources> <Applications> <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="TestSuite.App"> - <uap:VisualElements DisplayName="TestSuite" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="TestSuite" BackgroundColor="transparent"> + <uap:VisualElements DisplayName="Ice Test Suite" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="TestSuite" BackgroundColor="transparent"> <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"> </uap:DefaultTile> <uap:SplashScreen Image="Assets\SplashScreen.png" /> diff --git a/cpp/test/TestSuite/Controller.ice b/cpp/test/TestSuite/Controller.ice index 0508b4826da..7e4c2b95eda 100644 --- a/cpp/test/TestSuite/Controller.ice +++ b/cpp/test/TestSuite/Controller.ice @@ -13,10 +13,15 @@ module Test module Common { +exception ServerFailedException +{ + string reason; +}; + interface Server { void waitTestSuccess(); - void waitForServer(); + void waitForServer() throws ServerFailedException; void terminate(); }; @@ -24,8 +29,7 @@ sequence<string> StringSeq; interface Controller { - Server* runServer(string lang, string name, string protocol, string host, bool winrt, - StringSeq options); + Server* runServer(string lang, string name, string protocol, string host, bool winrt, StringSeq options); }; }; diff --git a/cpp/test/TestSuite/MainPage.xaml.cpp b/cpp/test/TestSuite/MainPage.xaml.cpp index aa64f17b31d..cabd8733ad2 100644..100755 --- a/cpp/test/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/TestSuite/MainPage.xaml.cpp @@ -563,6 +563,10 @@ TestRunner::run() { _page->failed(ex->Message); } + catch (Test::Common::ServerFailedException& ex) + { + _page->failed(ref new String(IceUtil::stringToWstring("Server failed to start:\n\n" + ex.reason).c_str())); + } catch(const std::exception& ex) { _page->failed(ref new String(IceUtil::stringToWstring(ex.what()).c_str())); |