1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

r9548: more additions to make test; better checks for starting and stopping smbd

This commit is contained in:
Gerald Carter
2005-08-23 22:10:44 +00:00
committed by Gerald (Jerry) Carter
parent b242f27860
commit dbaaf81cec
3 changed files with 76 additions and 21 deletions

View File

@ -2,3 +2,41 @@
## library file for test functions
##
##
## start/stop smbd daemon
##
check_smbd_running()
{
## the smbcontrol ping will return a 0 on success
smbcontrol $CONFIGURATION smbd ping 2>&1 > /dev/null
}
start_smbd()
{
echo "Starting smbd...."
smbd $CONFIGURATION || return $?
sleep 1
smbcontrol $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
}
stop_smbd()
{
smbd_pid=`cat $PIDDIR/smbd.pid`
echo "Shutting down smbd (pid $smbd_pid)..."
## belt and braces; first kill and then send a shutdown message
kill -TERM $smbd_pid
smbcontrol $CONFIGURATION smbd shutdown
## check to see if smbd is already running
check_smbd_running
if test $? == 0; then
echo "Unable to stop smbd!"
exit 2
fi
}

View File

@ -19,8 +19,6 @@ cd $OLD_PWD
## setup the various environment variables we need
##
DOMAIN=SAMBA-TEST
SRCDIR=`pwd`
SCRIPTDIR=$SRCDIR/script/tests
TMPDIR=$PREFIX_ABS/tmp
@ -32,16 +30,43 @@ LOCKDIR=$PREFIX_ABS/lockdir
LOGDIR=$PREFIX_ABS/logs
SOCKET_WRAPPER_DIR=$PREFIX_ABS/sockwrap
CONFIGURATION="-s $CONFFILE"
PATH=`pwd`/bin:$PATH
rm -rf $PREFIX/*
mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
export SRCDIR SCRIPTDIR
##
## create the test directory layout
##
/bin/rm -rf $PREFIX/*
mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
##
## Create the common config include file with the basic settings
##
cat >$LIBDIR/common.conf<<EOF
netbios name = LOCALHOST
workgroup = SAMBA-TEST
private dir = $PRIVATEDIR
pid directory = $PIDDIR
lock directory = $LOCKDIR
log file = $LOGDIR/log.%m
log level = 0
interfaces = lo
bind interfaces only = yes
panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
EOF
##
## ready to go...now loop through the tests
##
for testfile in `ls $SCRIPTDIR/t_*sh | sort`; do
echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
sh $testfile

View File

@ -4,27 +4,19 @@
cat >$CONFFILE<<EOF
[global]
netbios name = LOCALHOST
workgroup = $DOMAIN
private dir = $PRIVATEDIR
pid directory = $PIDDIR
lock directory = $LOCKDIR
log file = $LOGDIR/log.%m
interfaces = lo
bind interfaces only = yes
panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
include = $LIBDIR/common.conf
[test]
path = $TMPDIR
read only = no
EOF
##
## Test code
##
start_smbd || exit $?
smbd $CONFIGURATION || exit $?
sleep 1
smbclient $CONFIGURATION -L localhost -N -p 139
killall smbd
stop_smbd