summaryrefslogtreecommitdiff
path: root/cpp/tests/daemon_test
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-04-30 19:52:28 +0000
committerAlan Conway <aconway@apache.org>2007-04-30 19:52:28 +0000
commit6dfec93461aaf1ddf7dbd681bc67e6edcb8d81d3 (patch)
treed6beaf1290b2d16d9c18d0c05dff7916063b15fb /cpp/tests/daemon_test
parentb16914a34d89e4b99eceb0a3f5b277d454c4e39f (diff)
downloadqpid-python-6dfec93461aaf1ddf7dbd681bc67e6edcb8d81d3.tar.gz
Added -M2 tag to RPM release.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533840 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/tests/daemon_test')
-rwxr-xr-xcpp/tests/daemon_test18
1 files changed, 10 insertions, 8 deletions
diff --git a/cpp/tests/daemon_test b/cpp/tests/daemon_test
index 23f7f7d687..a137e247f0 100755
--- a/cpp/tests/daemon_test
+++ b/cpp/tests/daemon_test
@@ -5,18 +5,20 @@
TEMP=`mktemp`
trap 'rm -f $TEMP' 0
+qpidd=../src/qpidd
+client_test=./client_test
fail() { echo FAIL: $0:$* 1>&2; exit 1; }
# Start and stop daemon.
-PID=`qpidd --check --ppid` && fail $LINENO: qpidd already running $PID
-qpidd -d || $LINENO: qpidd -d failed
-qpidd --check || fail $LINENO: qpidd --check says qpidd didnt start
-client_test > $TEMP || fail $LINENO: client_test: `cat $TEMP`
-qpidd -q || fail $LINENO: qpidd -q failed
-qpidd -d || fail $LINENO: restart after quit failed.
-qpidd -k || fail $LINENO: qpidd -k failed
+PID=`$qpidd --check --ppid` && fail $LINENO: qpidd already running $PID
+$qpidd -d || $LINENO: qpidd -d failed
+$qpidd --check || fail $LINENO: qpidd --check says qpidd didnt start
+$client_test > $TEMP || fail $LINENO: client_test: `cat $TEMP`
+$qpidd -q || fail $LINENO: qpidd -q failed
+$qpidd -d || fail $LINENO: restart after quit failed.
+$qpidd -k || fail $LINENO: qpidd -k failed
# Supress expected message re. cleanup of old PID file.
-PID=`qpidd --check --ppid 2>/dev/null` && fail $LINENO: $PID still running after kill.
+PID=`$qpidd --check --ppid 2>/dev/null` && fail $LINENO: $PID still running after kill.
true