diff options
| author | Gordon Sim <gsim@apache.org> | 2013-08-07 20:55:26 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-08-07 20:55:26 +0000 |
| commit | deb23c3b6d41d964eae43e44a97c51fb02466355 (patch) | |
| tree | 0ae9a2a7f50f14ddd9c60a2f6736031a28b7bbe3 /cpp | |
| parent | 9fa0776e196ce89b9f267a1dd18257214b0c8756 (diff) | |
| download | qpid-python-deb23c3b6d41d964eae43e44a97c51fb02466355.tar.gz | |
QPID-5051: fixes for swig test failures on RHEL5 (and the failure to detect them)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1511483 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/qpid/types/Variant.h | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/types/Variant.cpp | 1 | ||||
| -rwxr-xr-x | cpp/src/tests/swig_python_tests | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/cpp/include/qpid/types/Variant.h b/cpp/include/qpid/types/Variant.h index e6bfd6bc0a..faba5fe9a4 100644 --- a/cpp/include/qpid/types/Variant.h +++ b/cpp/include/qpid/types/Variant.h @@ -38,7 +38,8 @@ namespace types { */ struct QPID_TYPES_CLASS_EXTERN InvalidConversion : public Exception { - InvalidConversion(const std::string& msg); + QPID_TYPES_EXTERN InvalidConversion(const std::string& msg); + QPID_TYPES_EXTERN ~InvalidConversion() throw(); }; enum VariantType { diff --git a/cpp/src/qpid/types/Variant.cpp b/cpp/src/qpid/types/Variant.cpp index 7a5f36851a..292bb5ef09 100644 --- a/cpp/src/qpid/types/Variant.cpp +++ b/cpp/src/qpid/types/Variant.cpp @@ -36,6 +36,7 @@ const std::string PREFIX("invalid conversion: "); } InvalidConversion::InvalidConversion(const std::string& msg) : Exception(PREFIX + msg) {} +InvalidConversion::~InvalidConversion() throw() {} class VariantImpl { diff --git a/cpp/src/tests/swig_python_tests b/cpp/src/tests/swig_python_tests index 2c5ad3b3b2..2ad17ebc33 100755 --- a/cpp/src/tests/swig_python_tests +++ b/cpp/src/tests/swig_python_tests @@ -50,17 +50,13 @@ start_broker echo "Running swigged python tests using broker on port $QPID_PORT" export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG -$QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests -RESULT=$? +$QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests || FAILED=1 if [[ -a $AMQPC_LIB ]] ; then export QPID_LOAD_MODULE=$AMQPC_LIB - $QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests - if test x$RESULT == x0; then - RESULT=$? - fi + $QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests || FAILED=1 fi stop_broker -if test x$RESULT != x0; then +if [[ $FAILED -eq 1 ]]; then fail "" fi |