summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/retry/Client.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-03-31 08:38:29 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-03-31 08:38:29 +0200
commit04c83affba981565fcca3b3bfa2a3d96ca331c81 (patch)
tree8cf749969ff9209645130bb8e4433d837c77c6d6 /cpp/test/Ice/retry/Client.cpp
parentMerge remote-tracking branch 'origin/3.6' (diff)
parentFixed Glacier2 bug which would cause hang on shutdown (diff)
downloadice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.bz2
ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.xz
ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/Ice/retry/Client.cpp')
-rw-r--r--cpp/test/Ice/retry/Client.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp
index 9efc4a6c764..176071a2f71 100644
--- a/cpp/test/Ice/retry/Client.cpp
+++ b/cpp/test/Ice/retry/Client.cpp
@@ -44,6 +44,9 @@ main(int argc, char* argv[])
//
initData.properties->setProperty("Ice.Warn.Connections", "0");
+ // Disable PrintStackTraces otherwise the test can fail on Windows/Debug
+ initData.properties->setProperty("Ice.PrintStackTraces", "0");
+
initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);