diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-03-30 11:29:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-03-30 11:29:41 +0200 |
| commit | 412fb8a008ce1f7a4444eda5e84872e47c939b27 (patch) | |
| tree | 9342f0a6a257bc8bb8f4b98f6428f79751110124 /cpp/test/Ice/slicing/objects/ServerAMD.cpp | |
| parent | Added back support for --valgrind option to allTests.py (diff) | |
| download | ice-412fb8a008ce1f7a4444eda5e84872e47c939b27.tar.bz2 ice-412fb8a008ce1f7a4444eda5e84872e47c939b27.tar.xz ice-412fb8a008ce1f7a4444eda5e84872e47c939b27.zip | |
Fixes for Ice/acm and timeout tests to be less time sensitive (ICE-7371, ICE-7555)
Diffstat (limited to 'cpp/test/Ice/slicing/objects/ServerAMD.cpp')
| -rw-r--r-- | cpp/test/Ice/slicing/objects/ServerAMD.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index 3a23352331f..9d466606cd4 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -40,6 +40,9 @@ main(int argc, char* argv[]) try { Ice::InitializationData initData = getTestInitData(argc, argv); +#ifndef ICE_CPP11_MAPPING + initData.properties->setProperty("Ice.CollectObjects", "1"); +#endif Ice::CommunicatorHolder ich(argc, argv, initData); return run(argc, argv, ich.communicator()); } |