diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2008-12-21 19:37:56 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2008-12-21 19:37:56 +0100 |
| commit | 141c88674f3f41be578706e0e123d65ede01cdf7 (patch) | |
| tree | 77e82b3b2182e625b08f3dbd6d4ca7dbfdcce7c3 /tests/daemon | |
| parent | b1c82eab4117d13ec570bdaacba88e46c8992e4a (diff) | |
| download | wolfbones-141c88674f3f41be578706e0e123d65ede01cdf7.tar.gz wolfbones-141c88674f3f41be578706e0e123d65ede01cdf7.tar.bz2 | |
reactivated fakeroot daemon test again
Diffstat (limited to 'tests/daemon')
| -rw-r--r-- | tests/daemon/GNUmakefile | 24 | ||||
| -rw-r--r-- | tests/daemon/testd.conf | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/tests/daemon/GNUmakefile b/tests/daemon/GNUmakefile index 0acae5d..94f3157 100644 --- a/tests/daemon/GNUmakefile +++ b/tests/daemon/GNUmakefile @@ -3,7 +3,7 @@ TOPDIR = ../.. SUBDIRS = INCLUDE_LIBS = \ - $(TOPDIR)/src/libwolfdaemon.a + $(TOPDIR)/src/libwolf.a INCLUDE_DIRS = -I$(TOPDIR)/include -I. @@ -33,13 +33,15 @@ local_clean: local_distclean: -@rm testd_cmdline.c testd_cmdline.h -local_test: -# TODO:still a little bit unrealiable with fakeroot -# @fakeroot $(TOPDIR)/src/testd -d --pidfile /tmp/testd.pid && \ -# sleep 3 && \ -# ls -altr /tmp/testd* && \ -# cat /tmp/testd.pid -# -@ps -alef | grep test | grep -v grep -# @sleep 1 -# @pkill testd -# -@ls -altr /tmp/testd* +test: + @fakeroot ./testd -d -c ./testd.conf && \ + sleep 3 && \ + ls -altr /tmp/testd* && \ + cat /tmp/testd.pid + -@ps -alef | grep testd | grep -v grep + @sleep 1 + @pkill testd + -@ls -altr /tmp/testd.pid + @cat /tmp/testd.log + -@rm -f /tmp/testd.log + diff --git a/tests/daemon/testd.conf b/tests/daemon/testd.conf index 4fe43e5..a194e1b 100644 --- a/tests/daemon/testd.conf +++ b/tests/daemon/testd.conf @@ -3,12 +3,12 @@ user = daemon group = daemon # Where to write the PID of the daemon process -pidfile = /var/run/testd.pid +pidfile = /tmp/testd.pid # Logging to system log facility (syslog) syslog-facility = DAEMON syslog-level = NOTICE # Logging to a plain text file -logfile = /var/log/testd.log +logfile = /tmp/testd.log logfile-level = NOTICE |