summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-03-29 11:25:31 -0400
committerBernard Normier <bernard@zeroc.com>2016-03-29 11:25:31 -0400
commitb92fa9a234a25a0fbaabc40481b3b5a69028869e (patch)
treeca0ab67347a53bb07f8f94509167fb86b157bfd4
parentstacktrace test fixes (diff)
downloadice-b92fa9a234a25a0fbaabc40481b3b5a69028869e.tar.bz2
ice-b92fa9a234a25a0fbaabc40481b3b5a69028869e.tar.xz
ice-b92fa9a234a25a0fbaabc40481b3b5a69028869e.zip
ICE-7047: disabled PrintStackTraces
-rw-r--r--cpp/test/Ice/retry/Client.cpp3
-rw-r--r--cpp/test/Ice/retry/Server.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp
index ad8dd2195c4..03022e8c3f6 100644
--- a/cpp/test/Ice/retry/Client.cpp
+++ b/cpp/test/Ice/retry/Client.cpp
@@ -49,6 +49,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");
communicator = Ice::initialize(argc, argv, initData);
diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp
index 5fc3c4e6e2f..a27d6705630 100644
--- a/cpp/test/Ice/retry/Server.cpp
+++ b/cpp/test/Ice/retry/Server.cpp
@@ -43,6 +43,7 @@ main(int argc, char* argv[])
Ice::InitializationData initData;
initData.properties = Ice::createProperties(argc, argv);
initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+ initData.properties->setProperty("Ice.PrintStackTraces", "0");
communicator = Ice::initialize(argc, argv, initData);
status = run(argc, argv, communicator);
}