Squashed 'src/univalue/' changes from fe805ea..07947ff

07947ff Merge bitcoin#9: [tests] Fix BOOST_CHECK_THROW macro
ec849d9 [tests] Fix BOOST_CHECK_THROW macro
31bc9f5 Merge bitcoin#8: Remove unused Homebrew workaround
fa04209 Remove HomeBrew workaround
a523e08 Merge bitcoin#7: Declare single-argument (non-converting) constructors "explicit"
a9e53b3 Merge bitcoin#4: Pull upstream
16a1f7f Merge bitcoin#3: Pull upstream
daf1285 Merge pull request #2 from jgarzik/master
f32df99 Merge branch '2016_04_unicode' into bitcoin
280b191 Merge remote-tracking branch 'jgarzik/master' into bitcoin
2740c4f Merge branch '2015_11_escape_plan' into bitcoin

git-subtree-dir: src/univalue
git-subtree-split: 07947ff

Author: MarcoFalke

.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
 

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) { \