From cd7e007f8f931f994c829e9853ecfbb469cb20aa Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Thu, 29 Jan 2009 18:18:52 +0000
Subject: Run python tests against a single-member cluster in check-long.

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

(limited to 'cpp/src/tests/python_tests')

diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
index 30bb8259a4..e56b91ba5c 100755
--- a/cpp/src/tests/python_tests
+++ b/cpp/src/tests/python_tests
@@ -22,18 +22,11 @@
 # Run the python tests.
 QPID_PORT=${QPID_PORT:-5672}
 PYTHON_TESTS=${PYTHON_TESTS:-$*}
-MY_DIR=`dirname \`which $0\``
-QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python}
+QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-`dirname $0`/../../../python}
+SPEC=${SPEC:-0-10-errata}
+FAILING=${FAILING:-cpp_failing_0-10.txt}
 
-run() {
-    SPEC=$1
-    FAILING=$2
-    ./run-tests --skip-self-test -v -s $SPEC -I $FAILING -b localhost:$QPID_PORT $PYTHON_TESTS || { echo "FAIL python tests for $SPEC"; exit 1; }
-}
+test -d $QPID_PYTHON_DIR || { echo "WARNING: No python tests. $QPID_PYTHON_DIR not found."; exit 1; }
+cd $QPID_PYTHON_DIR
+./run-tests --skip-self-test -v -s $SPEC -I $FAILING -b localhost:$QPID_PORT $PYTHON_TESTS || { echo "FAIL python tests for $SPEC"; exit 1; }
 
-if test -d ${QPID_PYTHON_DIR} ;  then
-    cd ${QPID_PYTHON_DIR}
-    run 0-10-errata cpp_failing_0-10.txt
-else
-    echo "WARNING: No python tests. $QPID_PYTHON_DIR not found."
-fi
-- 
cgit v1.2.1