You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2018/03/29 22:28:09 UTC
[1/2] qpid-proton git commit: NO-JIRA: [C++ binding] Catch unknown
exceptions in tests
Repository: qpid-proton
Updated Branches:
refs/heads/master b9f139a60 -> 89b312390
NO-JIRA: [C++ binding] Catch unknown exceptions in tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8884e380
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8884e380
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8884e380
Branch: refs/heads/master
Commit: 8884e38003cc3ba0ed04ec4b6bd969612774ac7f
Parents: b9f139a
Author: Andrew Stitcher <as...@apache.org>
Authored: Thu Mar 29 18:27:04 2018 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Mar 29 18:27:04 2018 -0400
----------------------------------------------------------------------
proton-c/bindings/cpp/src/test_bits.hpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8884e380/proton-c/bindings/cpp/src/test_bits.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/test_bits.hpp b/proton-c/bindings/cpp/src/test_bits.hpp
index 4e019f2..28271f0 100644
--- a/proton-c/bindings/cpp/src/test_bits.hpp
+++ b/proton-c/bindings/cpp/src/test_bits.hpp
@@ -67,12 +67,14 @@ inline void assert_equalish(T want, T got, T delta, const std::string& what)
std::cout << "TEST: " << #TEST << std::endl; \
TEST; \
break; \
- } catch(const test::fail& e) { \
+ } catch(const test::fail& e) { \
std::cout << "FAIL " << #TEST << std::endl << e.what() << std::endl; \
} catch(const std::exception& e) { \
std::cout << "ERROR " << #TEST << std::endl << __FILE__ << ":" << __LINE__ << ": " << e.what() << std::endl; \
+ } catch(...) { \
+ std::cout << "ERROR " << #TEST << std::endl << __FILE__ << ":" << __LINE__ << ": (unknown)" << std::endl; \
} \
- ++BAD_COUNT; \
+ ++BAD_COUNT; \
} while(0)
/* Like RUN_TEST but only if one of the argv strings is found in the test EXPR */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: PROTON-1695: Enable SASL for MacOS CI
build
Posted by as...@apache.org.
PROTON-1695: Enable SASL for MacOS CI build
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/89b31239
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/89b31239
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/89b31239
Branch: refs/heads/master
Commit: 89b31239000bc35204f0e03543166608a29f657c
Parents: 8884e38
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Mar 23 16:04:16 2018 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Mar 29 18:27:54 2018 -0400
----------------------------------------------------------------------
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/89b31239/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 40eb188..af12f21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
env:
- PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
- PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
- - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DSASL_IMPL=none -DBUILD_RUBY=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DBUILD_RUBY=NO'
before_install:
- brew update
- brew upgrade cmake python openssl
@@ -48,7 +48,7 @@ matrix:
env:
- PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
- PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
- - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DSASL_IMPL=none -DBUILD_RUBY=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_RUBY=NO'
before_install:
- brew update
- brew upgrade cmake python openssl
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org