From aff28fa2271736945b54dd140f11a4eb567b5b74 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 17 May 2005 07:37:17 +0000 Subject: r6852: implement an idea from kinkie to make the 'make test' target automatically kill smbd when finished, using a fifo this makes 'make test' much safer for build farm usage (This used to be commit a33a424d5bdb24797a83097b8ae6b9ca70793295) --- source4/script/tests/selftest.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'source4/script') diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index d1a60c02e8..f012c7c347 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -41,11 +41,14 @@ EOF ADDARG="-s $CONFFILE" -$SRCDIR/bin/smbd -s $CONFFILE -M single || exit 1 +rm -f smbd_test.fifo +mkfifo smbd_test.fifo +$SRCDIR/bin/smbd -d1 -s $CONFFILE -M single -i < smbd_test.fifo || exit 1 & sleep 2 -$SRCDIR/script/tests/test_rpc.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || exit 1 -$SRCDIR/script/tests/test_binding_string.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || exit 1 -$SRCDIR/script/tests/test_echo.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || exit 1 -$SRCDIR/script/tests/test_posix.sh //localhost/tmp $USERNAME $PASSWORD $ADDARG || exit 1 -$SRCDIR/bin/smbtorture $ADDARG ncalrpc: LOCAL-* || exit 1 -kill `cat $PIDDIR/smbd.pid` +( + $SRCDIR/script/tests/test_rpc.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || exit 1 + $SRCDIR/script/tests/test_binding_string.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || exit 1 + $SRCDIR/script/tests/test_echo.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || exit 1 + $SRCDIR/script/tests/test_posix.sh //localhost/tmp $USERNAME $PASSWORD $ADDARG || exit 1 + $SRCDIR/bin/smbtorture $ADDARG ncalrpc: LOCAL-* || exit 1 +) 9>smbd_test.fifo -- cgit