diff options
| author | Mark Spruiell <mes@zeroc.com> | 2018-03-21 15:00:43 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2018-03-21 15:00:43 -0700 |
| commit | 6ae4875e549b674103d3c688571e8321eb18f2ce (patch) | |
| tree | 4abd75010c35f83e13343d8fd5898708fa71fe79 /cpp/test/Ice/exceptions/AllTests.cpp | |
| parent | Fix for .NET Core where SO_REUSEADDR isn't set on bound socket (ICE-8744) (diff) | |
| download | ice-6ae4875e549b674103d3c688571e8321eb18f2ce.tar.bz2 ice-6ae4875e549b674103d3c688571e8321eb18f2ce.tar.xz ice-6ae4875e549b674103d3c688571e8321eb18f2ce.zip | |
C++ test fixes for Bluetooth compatibility
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/exceptions/AllTests.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index a6a12ea380b..9940da22f57 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -404,6 +404,8 @@ endsWith(const string& s, const string& findme) ThrowerPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { + const string protocol = communicator->getProperties()->getProperty("Ice.Default.Protocol"); + cout << "testing ice_print()/what()... " << flush; { A a; @@ -963,7 +965,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; } - if(thrower->ice_getConnection()) + if(thrower->ice_getConnection() && protocol != "bt") { cout << "testing memory limit marshal exception..." << flush; try |