diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2008-07-29 20:25:49 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2008-07-29 20:25:49 +0000 |
| commit | e051ae35c30c2530fafd5c3855e1cb67e5252593 (patch) | |
| tree | 95067795a6555df928049e60938c4a2bafb41e15 /qpid/cpp/src/tests/stop_broker | |
| parent | a344e91b126c4923eadd3d2b0024d681e8570f70 (diff) | |
| download | qpid-python-e051ae35c30c2530fafd5c3855e1cb67e5252593.tar.gz | |
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@680826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/stop_broker')
| -rwxr-xr-x | qpid/cpp/src/tests/stop_broker | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/stop_broker b/qpid/cpp/src/tests/stop_broker index 0e67ac24dd..6912795fca 100755 --- a/qpid/cpp/src/tests/stop_broker +++ b/qpid/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 |