Browse Source

Merge #11952: [qa] univalue: Bump subtree

88411e9 Squashed 'src/univalue/' changes from fe805ea74f..07947ff2da (MarcoFalke)

Pull request description:

  Pulls in the test changes to the univalue subtree.

  Beside looking at the code, reviewers should refer to https://github.com/bitcoin/bitcoin/blob/master/contrib/devtools/README.md#git-subtree-checksh on how to verify the subtree pull.

Tree-SHA512: 09493625a573dca1140570326ee90c1bb84e4893e1dab2cdd51bc23ae1fba1e33c43ed771ca9e112ac71b0242e8a8d058071334562c738d502587eadd5a0f114
0.16
Wladimir J. van der Laan 7 years ago
parent
commit
9ab9963386
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
  1. 1
      src/univalue/.travis.yml
  2. 3
      src/univalue/test/object.cpp

1
src/univalue/.travis.yml

@ -25,7 +25,6 @@ addons: @@ -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

3
src/univalue/test/object.cpp

@ -19,9 +19,10 @@ @@ -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) { \

Loading…
Cancel
Save