Merge pull request #3420

bccd532 Fix unit test error on OSX 10.9 using Apple LLVM v5.0. (Kangmo)
This commit is contained in:
Wladimir J. van der Laan 2013-12-15 17:35:20 +01:00
commit a5a65bbc90
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -61,9 +61,14 @@ BOOST_AUTO_TEST_CASE(compactsize)
static bool isCanonicalException(const std::ios_base::failure& ex) static bool isCanonicalException(const std::ios_base::failure& ex)
{ {
return std::string("non-canonical ReadCompactSize()") == ex.what(); std::string strExplanatoryString("non-canonical ReadCompactSize()");
return strExplanatoryString == ex.what() ||
// OSX Apple LLVM version 5.0 (OSX 10.9)
strExplanatoryString + ": unspecified iostream_category error" == ex.what();
} }
BOOST_AUTO_TEST_CASE(noncanonical) BOOST_AUTO_TEST_CASE(noncanonical)
{ {
// Write some non-canonical CompactSize encodings, and // Write some non-canonical CompactSize encodings, and