From 7221b1ca1cda94ea831942db53f15c14cd3cfe1d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 19 Jul 2007 02:03:02 +0000 Subject: * lib/broker/Daemon.cpp, .h - Rewrote to remove libdaemon dependency. - PID file stored in /var/run if root, /tmp otherwise. * src/qpidd.cpp: Use new Daemon.cpp. - lock files stored in /var/run (for root) or /tmp. - updated to trunk daemon flag behavior. * lib/broker/Makefile.am (libqpidbroker_la_LIBADD): - Daemon.cpp now needs -lboost_iostreams * NOTICE, README: Removed mention of libdaemon. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557452 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/tests/daemon_test | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'cpp/tests') diff --git a/cpp/tests/daemon_test b/cpp/tests/daemon_test index 0800ee9cd5..05e9ed88a0 100755 --- a/cpp/tests/daemon_test +++ b/cpp/tests/daemon_test @@ -29,14 +29,9 @@ 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 +PID=`$qpidd --check>/dev/null 2>&1` && fail $LINENO: qpidd already running $PID $qpidd -d || $LINENO: qpidd -d failed -$qpidd --check || fail $LINENO: qpidd --check says qpidd didnt start +$qpidd --check >/dev/null || 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. - true -- cgit v1.2.1