diff options
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/tests/python_tests | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/run_federation_tests | 14 | ||||
| -rwxr-xr-x | cpp/src/tests/stop_broker | 7 |
3 files changed, 15 insertions, 8 deletions
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests index 109d01bd5e..896692e41e 100755 --- a/cpp/src/tests/python_tests +++ b/cpp/src/tests/python_tests @@ -2,7 +2,7 @@ # Run the python tests. QPID_PORT=${QPID_PORT:-5672} PYTHON_TESTS=${PYTHON_TESTS:-$*} -MY_DIR=$(dirname $(which $0)) +MY_DIR=`dirname \`which $0\`` QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python} run() { diff --git a/cpp/src/tests/run_federation_tests b/cpp/src/tests/run_federation_tests index 3a85f15c46..6142c1c37c 100755 --- a/cpp/src/tests/run_federation_tests +++ b/cpp/src/tests/run_federation_tests @@ -1,9 +1,9 @@ #!/bin/sh # Run the federation tests. -MY_DIR=$(dirname $(which $0)) +MY_DIR=`dirname \`which $0\`` PYTHON_DIR=${MY_DIR}/../../../python -trap stop_brokers EXIT +trap stop_brokers INT TERM QUIT start_brokers() { ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no > qpidd.port @@ -20,7 +20,13 @@ stop_brokers() { if test -d ${PYTHON_DIR} ; then start_brokers echo "Running federation tests using brokers on ports $LOCAL_PORT $REMOTE_PORT" - export PYTHONPATH=${PYTHON_DIR} - ${MY_DIR}/federation.py -v -s ${MY_DIR}/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --remote-port $REMOTE_PORT || { echo "FAIL federation tests"; exit 1; } + PYTHONPATH=${PYTHON_DIR} + export PYTHONPATH + ${MY_DIR}/federation.py -v -s ${MY_DIR}/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --remote-port $REMOTE_PORT + RETCODE=$? + stop_brokers + if test x$RETCODE != x0; then + echo "FAIL federation tests"; exit 1; + fi fi diff --git a/cpp/src/tests/stop_broker b/cpp/src/tests/stop_broker index 0e67ac24dd..6912795fca 100755 --- a/cpp/src/tests/stop_broker +++ b/cpp/src/tests/stop_broker @@ -1,19 +1,20 @@ #!/bin/sh # Stop the broker, check for errors. # -export QPID_PORT=`cat qpidd.port` +QPID_PORT=`cat qpidd.port` +export QPID_PORT rm -f qpidd.port ../qpidd --quit || ERROR=1 # Check qpidd.log. -grep -a 'warning\|error\|critical' qpidd.log && { +egrep 'warning\|error\|critical' qpidd.log && { echo "WARNING: Suspicious broker log entries in qpidd.log, above." } # Check valgrind log. if test -n "$VALGRIND"; then - source `dirname $0`/vg_check $VG_LOG* + . `dirname $0`/vg_check $VG_LOG* vg_check qpidd.vglog* || ERROR=1 fi |