From 66528d5ed7916352bd2ebbddd413874773020c6a Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Thu, 15 May 2008 21:34:10 +0000
Subject: - Enable python tets and examples in make rpmbuild. - Remove
 hard-coded amqp.xml paths from python examples.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@656853 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/examples/verify_all    | 6 ++----
 cpp/src/tests/python_tests | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'cpp')

diff --git a/cpp/examples/verify_all b/cpp/examples/verify_all
index 9db2214903..1e122572ea 100755
--- a/cpp/examples/verify_all
+++ b/cpp/examples/verify_all
@@ -6,16 +6,14 @@ verify=`dirname $0`/verify
 topsrcdir=$1
 qpidd=$2
 exclude_regexp=$3
-
-python=$topsrcdir/python
+python=${QPID_PYTHON_DIR:-$topsrcdir/python}
 
 trap "$qpidd -q" exit
 export QPID_PORT=`$qpidd -dp0 --data-dir "" --auth no` || { echo "Can't run qpidd" ; exit 1; }
 export PYTHON_EXAMPLES=$python/examples
 export PYTHONPATH=$python:$PYTHONPATH
-export AMQP_SPEC=$topsrcdir/specs/amqp.0-10.xml
 
-test -d $PYTHON_EXAMPLES || echo "Warning: not verifying python examples, $PYTHON_EXAMPLES not found"
+test -d $PYTHON_EXAMPLES || echo "WARNING: No python examples. $PYTHON_EXAMPLES not found."
 find="find examples"
 test -d $PYTHON_EXAMPLES && find="$find $PYTHON_EXAMPLES"
 find="$find -name verify"
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
index 553c5f4cdb..109d01bd5e 100755
--- a/cpp/src/tests/python_tests
+++ b/cpp/src/tests/python_tests
@@ -3,7 +3,7 @@
 QPID_PORT=${QPID_PORT:-5672}
 PYTHON_TESTS=${PYTHON_TESTS:-$*}
 MY_DIR=$(dirname $(which $0))
-PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python}
+QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python}
 
 run() {
     SPEC=$1
@@ -11,9 +11,9 @@ run() {
     ./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 ${PYTHON_DIR} ;  then
-    cd ${PYTHON_DIR}
+if test -d ${QPID_PYTHON_DIR} ;  then
+    cd ${QPID_PYTHON_DIR}
     run 0-10-errata cpp_failing_0-10.txt
 else
-    echo Warning: python tests not found.
+    echo "WARNING: No python tests. $QPID_PYTHON_DIR not found."
 fi
-- 
cgit v1.2.1