diff options
| author | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-17 16:53:05 +0200 |
| commit | 9e833a51504b14ac852863dcad59a51e6025ce79 (patch) | |
| tree | 6ca0297b6e6575fe4c6b2d48b606fef8132b9e5a /cpp/test/Ice/facets/Server.cpp | |
| parent | implementing optional params in Java (diff) | |
| parent | WinRT support (diff) | |
| download | ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.bz2 ice-9e833a51504b14ac852863dcad59a51e6025ce79.tar.xz ice-9e833a51504b14ac852863dcad59a51e6025ce79.zip | |
Merge branch 'master' into encoding11
Conflicts:
CHANGES
cpp/src/Ice/EndpointI.cpp
cpp/src/Ice/TcpConnector.cpp
cpp/src/Ice/TcpConnector.h
cpp/src/Ice/UdpConnector.cpp
cpp/src/Ice/UdpConnector.h
Diffstat (limited to 'cpp/test/Ice/facets/Server.cpp')
| -rw-r--r-- | cpp/test/Ice/facets/Server.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index 4ef44bc4caa..e12f51ff762 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -8,8 +8,11 @@ // ********************************************************************** #include <Ice/Ice.h> +#include <TestCommon.h> #include <TestI.h> +DEFINE_TEST("server") + using namespace std; int @@ -24,7 +27,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) adapter->addFacet(f, communicator->stringToIdentity("d"), "facetEF"); Ice::ObjectPtr h = new HI(communicator); adapter->addFacet(h, communicator->stringToIdentity("d"), "facetGH"); - + TEST_READY adapter->activate(); communicator->waitForShutdown(); |