diff options
author | Benoit Foucher <benoit@zeroc.com> | 2013-09-09 19:12:28 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-09 19:12:28 +0200 |
commit | 8a0d1c7e34d8bd18bd85666cce94403a5158975c (patch) | |
tree | 36050a818282c0a92ee88a6ef28354e186c5aebe /cpp/test/Ice/metrics/Client.cpp | |
parent | Test scripts improvements (diff) | |
download | ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.tar.bz2 ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.tar.xz ice-8a0d1c7e34d8bd18bd85666cce94403a5158975c.zip |
Fixed ICE-5196: allow setting an observer with IceMX enabled
Diffstat (limited to 'cpp/test/Ice/metrics/Client.cpp')
-rw-r--r-- | cpp/test/Ice/metrics/Client.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/test/Ice/metrics/Client.cpp b/cpp/test/Ice/metrics/Client.cpp index f30ad6032ad..4f541c2f7cc 100644 --- a/cpp/test/Ice/metrics/Client.cpp +++ b/cpp/test/Ice/metrics/Client.cpp @@ -10,6 +10,7 @@ #include <Ice/Ice.h> #include <TestCommon.h> #include <Test.h> +#include <InstrumentationI.h> DEFINE_TEST("client") @@ -17,10 +18,10 @@ using namespace std; using namespace Test; int -run(int, char**, const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPtr& observer) { - MetricsPrx allTests(const Ice::CommunicatorPtr&); - MetricsPrx metrics = allTests(communicator); + MetricsPrx allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&); + MetricsPrx metrics = allTests(communicator, observer); metrics->shutdown(); return EXIT_SUCCESS; } @@ -40,8 +41,10 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.Admin.DelayCreation", "1"); initData.properties->setProperty("Ice.Warn.Connections", "0"); initData.properties->setProperty("Ice.MessageSizeMax", "50000"); + CommunicatorObserverIPtr observer = new CommunicatorObserverI(); + initData.observer = observer; communicator = Ice::initialize(argc, argv, initData); - status = run(argc, argv, communicator); + status = run(argc, argv, communicator, observer); } catch(const Ice::Exception& ex) { |