From 88411e98e50c92f8990733eee0bc353ac8f21a35 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 19 Dec 2017 16:44:08 -0500 Subject: [PATCH] Squashed 'src/univalue/' changes from fe805ea74f..07947ff2da 07947ff2da Merge #9: [tests] Fix BOOST_CHECK_THROW macro ec849d9a28 [tests] Fix BOOST_CHECK_THROW macro 31bc9f5a49 Merge #8: Remove unused Homebrew workaround fa042093d1 Remove HomeBrew workaround a523e08ae4 Merge #7: Declare single-argument (non-converting) constructors "explicit" a9e53b38ba Merge #4: Pull upstream 16a1f7f6e9 Merge #3: Pull upstream daf1285af6 Merge pull request #2 from jgarzik/master f32df99e96 Merge branch '2016_04_unicode' into bitcoin 280b191cb1 Merge remote-tracking branch 'jgarzik/master' into bitcoin 2740c4f712 Merge branch '2015_11_escape_plan' into bitcoin git-subtree-dir: src/univalue git-subtree-split: 07947ff2da9ef02a9dfa13346bc5545708e3ebe7 --- .travis.yml | 1 - test/object.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 132743d34..43a1ed362 100644 --- a/.travis.yml +++ b/.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/test/object.cpp b/test/object.cpp index 02446292a..679cc9f14 100644 --- a/test/object.cpp +++ b/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) { \