You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2014/04/11 15:18:23 UTC
svn commit: r1586646 - in /qpid/trunk/qpid/cpp/src/tests: interlink_tests.py
test_env.sh.in
Author: aconway
Date: Fri Apr 11 13:18:23 2014
New Revision: 1586646
URL: http://svn.apache.org/r1586646
Log:
QPID-5681: Fix core dump in interlink_tests.
Use native python client for older (<=0.6) versions of proton.
Modified:
qpid/trunk/qpid/cpp/src/tests/interlink_tests.py
qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
Modified: qpid/trunk/qpid/cpp/src/tests/interlink_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/interlink_tests.py?rev=1586646&r1=1586645&r2=1586646&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/interlink_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/interlink_tests.py Fri Apr 11 13:18:23 2014
@@ -72,7 +72,12 @@ class AmqpBrokerTest(BrokerTest):
return self.popen(cmd, stdout=PIPE)
def ready_receiver(self, config):
- s = self.broker.connect().session()
+ # NOTE: some tests core dump when run with SWIG binding over proton
+ # version<=0.6. This is fixed on proton 0.7.
+ def use_native():
+ pv=os.environ.get("QPID_PROTON_VERSION")
+ return pv and [int(n) for n in pv.split(".")] <= [0,6]
+ s = self.broker.connect(native=use_native()).session()
r = s.receiver("readyq; {create:always}")
cmd = ["qpid-receive",
"--broker", config.url,
Modified: qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_env.sh.in?rev=1586646&r1=1586645&r2=1586646&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_env.sh.in Fri Apr 11 13:18:23 2014
@@ -94,3 +94,6 @@ test -z "$BOOST_TEST_CATCH_SYSTEM_ERRORS
# Source this for useful common testing functions
export QPID_TEST_COMMON=$srcdir/test_env_common.sh
+
+# Proton configuration
+export QPID_PROTON_VERSION=@Proton_VERSION@
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org