diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-12-19 16:49:01 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-12-19 16:44:57 -0500 |
| commit | fad349c507a3179fa117ddf3ad6e651609c366cc (patch) | |
| tree | b9e9fd9cdb414ecf1563fec7ceb829cd988c1413 | |
| parent | 2971fd030f6e20ff5279bd86ba18acc5e5ed1ce9 (diff) | |
| parent | 88411e98e50c92f8990733eee0bc353ac8f21a35 (diff) | |
univalue: Bump subtree
| -rw-r--r-- | src/univalue/.travis.yml | 1 | ||||
| -rw-r--r-- | src/univalue/test/object.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/univalue/.travis.yml b/src/univalue/.travis.yml index 132743d349..43a1ed362e 100644 --- a/src/univalue/.travis.yml +++ b/src/univalue/.travis.yml @@ -25,7 +25,6 @@ addons: - pkg-config before_script: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall libtool; brew install libtool; fi - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh diff --git a/src/univalue/test/object.cpp b/src/univalue/test/object.cpp index 02446292a1..679cc9f143 100644 --- a/src/univalue/test/object.cpp +++ b/src/univalue/test/object.cpp @@ -19,9 +19,10 @@ #define BOOST_CHECK_THROW(stmt, excMatch) { \ try { \ (stmt); \ + assert(0 && "No exception caught"); \ } catch (excMatch & e) { \ } catch (...) { \ - assert(0); \ + assert(0 && "Wrong exception caught"); \ } \ } #define BOOST_CHECK_NO_THROW(stmt) { \ |