diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-15 17:35:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-15 17:35:28 +0100 |
| commit | a5a65bbc90890fa4532313beec1b1b422f7a5c81 (patch) | |
| tree | e3e37290488600683ff51943284b971567440d96 | |
| parent | d05ce63c98f6fb7244d25fcdb74eb94d194c3c86 (diff) | |
| parent | bccd5324ab5b76c21b01bfe9c8ec7ab2061c93e4 (diff) | |
| download | bitcoin-a5a65bbc90890fa4532313beec1b1b422f7a5c81.tar.xz | |
Merge pull request #3420
bccd532 Fix unit test error on OSX 10.9 using Apple LLVM v5.0. (Kangmo)
| -rw-r--r-- | src/test/serialize_tests.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index afcdd118bc..885a91658d 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -61,9 +61,14 @@ BOOST_AUTO_TEST_CASE(compactsize) 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) { // Write some non-canonical CompactSize encodings, and |