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 | fe73a28361d4b6896d4cfd54379e429ecbdcfedf (patch) | |
| tree | 98fd60e5e408256565bb4d3f7ad1c16e9c21b7a7 /cpp/src/tests/stop_broker | |
| parent | 10f23aca8dab83f51cb4fce341dc7fef7dac44b9 (diff) | |
| download | qpid-python-fe73a28361d4b6896d4cfd54379e429ecbdcfedf.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/qpid@680826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/stop_broker')
| -rwxr-xr-x | cpp/src/tests/stop_broker | 7 |
1 files changed, 4 insertions, 3 deletions
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 |