summaryrefslogtreecommitdiff
path: root/cpp/src/tests
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-09-18 21:30:18 +0000
committerAlan Conway <aconway@apache.org>2007-09-18 21:30:18 +0000
commitbe203866995fc2cc9a066fe8acc8caa87937fc7b (patch)
treeab0997dbe6a0b450823dc7eadf52f379436217fd /cpp/src/tests
parent6d8a7813e9b75b3dd870b1e815cb5b78ef6da8ee (diff)
downloadqpid-python-be203866995fc2cc9a066fe8acc8caa87937fc7b.tar.gz
* src/qpid/broker/SemanticHandler.cpp: add assert to suspect logic for execution.flush
* src/tests/stop_broker: Warn rather than error on qpidd.log messages. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@577072 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
-rwxr-xr-xcpp/src/tests/stop_broker7
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/tests/stop_broker b/cpp/src/tests/stop_broker
index 4f183d18f5..e141ef9841 100755
--- a/cpp/src/tests/stop_broker
+++ b/cpp/src/tests/stop_broker
@@ -4,14 +4,11 @@
export QPID_PORT=`cat qpidd.port`
rm -f qpidd.port
-# Wait for daemon to quit
../qpidd --quit || ERROR=$?
-while ../qpidd --check >/dev/null 2>&1; do true; done
# Check qpidd.log.
-egrep 'warning|error|critical' qpidd.log && {
- echo "Suspicious broker log entries in qpidd.log, above."
- ERROR=1
+grep -a 'warning\|error\|critical' qpidd.log && {
+ echo "WARNING: Suspicious broker log entries in qpidd.log, above."
}
# Check valgrind log.