From fe73a28361d4b6896d4cfd54379e429ecbdcfedf Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 29 Jul 2008 20:25:49 +0000 Subject: 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. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@680826 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/stop_broker | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cpp/src/tests/stop_broker') 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 -- cgit v1.2.1