From 780a3211d2b7a098455a6d8ec00067e6958119ba Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Tue, 12 Nov 2013 21:22:24 +0000
Subject: QPID-5330: Simplify testing for presence of python testing code -  
 this makes it much easier not to call the python testing code   when it isn't
 available

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541241 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/tests/swig_python_tests | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'qpid/cpp/src/tests/swig_python_tests')

diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index 2eb8ce67b3..1815372863 100755
--- a/qpid/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
@@ -20,7 +20,10 @@
 #
 
 # Run the python tests.
-source ./test_env.sh
+source $QPID_TEST_COMMON
+
+ensure_python_tests
+
 trap stop_broker INT TERM QUIT
 
 if [[ -a $AMQP_LIB ]] ; then
@@ -43,7 +46,6 @@ stop_broker() {
     $QPIDD_EXEC -q --port $QPID_PORT
 }
 
-test -d $PYTHON_DIR || skip "no python dir"
 test -f $PYTHONSWIGMODULE || skip "no swigged python client"
 
 start_broker
-- 
cgit v1.2.1