Author: astitcher
Date: Tue Jul 29 13:25:49 2008
New Revision: 680826
URL: http://svn.apache.org/viewvc?rev=680826&view=rev
Log:
QPID-1198: (Partial) Fix test shell scripts to work with /bin/sh
Patches from Manuel Teira.
These scripts have #!/bin/sh but they were previously really
dependent on bash.
Modified:
incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests
incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/python_tests?rev=680826&r1=680825&r2=680826&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/python_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/python_tests Tue Jul 29 13:25:49
2008
@@ -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() {
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests?rev=680826&r1=680825&r2=680826&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests Tue Jul 29
13:25:49 2008
@@ -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 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker?rev=680826&r1=680825&r2=680826&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker Tue Jul 29 13:25:49 2008
@@ -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
