sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

make test: activate nss_wrapper for make test

Browse Source 
metze
(This used to be commit 02cfd28362)
This commit is contained in:
Stefan Metzmacher 2007-11-05 09:49:08 +01:00
parent c4a20912b1
commit cfec6c3083
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/Makefile.in
View File

@ -2044,11 +2044,11 @@ test_pam_modules: pam_modules
## ##
test: all torture timelimit test: all torture timelimit
@echo Running Test suite @echo Running Test suite
@sh $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}" @PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"
valgrindtest: all torture timelimit valgrindtest: all torture timelimit
@echo Running Test suite with valgrind @echo Running Test suite with valgrind
@NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \ @NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \ SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/st/valgrind.log" \
$(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}" PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"

31
source3/script/tests/selftest.sh
View File

@ -30,6 +30,8 @@ export TORTURE_MAXTIME
SERVER=localhost2 SERVER=localhost2
SERVER_IP=127.0.0.2 SERVER_IP=127.0.0.2
USERNAME=`PATH=/usr/ucb:$PATH whoami` USERNAME=`PATH=/usr/ucb:$PATH whoami`
USERID=`PATH=/usr/ucb:$PATH id -u`
GROUPID=`PATH=/usr/ucb:$PATH id -g`
PASSWORD=test PASSWORD=test
SRCDIR="`dirname $0`/../.." SRCDIR="`dirname $0`/../.."
@ -48,6 +50,8 @@ LOGDIR=$PREFIX_ABS/logs
SOCKET_WRAPPER_DIR=$PREFIX/sw SOCKET_WRAPPER_DIR=$PREFIX/sw
CONFIGURATION="-s $CONFFILE" CONFIGURATION="-s $CONFFILE"
SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE" SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE"
NSS_WRAPPER_PASSWD="$PRIVATEDIR/passwd"
NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
export PREFIX PREFIX_ABS export PREFIX PREFIX_ABS
export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
@ -57,6 +61,7 @@ export SRCDIR SCRIPTDIR BINDIR
export USERNAME PASSWORD export USERNAME PASSWORD
export SMBTORTURE4 export SMBTORTURE4
export SERVER SERVER_IP export SERVER SERVER_IP
export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
PATH=bin:$PATH PATH=bin:$PATH
export PATH export PATH
@ -73,6 +78,15 @@ if test "x`smbd -b | grep SOCKET_WRAPPER`" = "x"; then
exit 1 exit 1
fi fi
if test "x`smbd -b | grep NSS_WRAPPER`" = "x"; then
echo "***"
echo "*** You must include --enable-nss-wrapper when compiling Samba"
echo "*** in order to execute 'make test'. Exiting...."
echo "***"
exit 1
fi
## ##
## create the test directory layout ## create the test directory layout
## ##
@ -128,9 +142,9 @@ cat >$SERVERCONFFILE<<EOF
passdb backend = tdbsam passdb backend = tdbsam
; Necessary to add the build farm hacks add user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
add user script = /bin/false add machine script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
add machine script = /bin/false delete user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u
kernel oplocks = no kernel oplocks = no
kernel change notify = no kernel change notify = no
@ -170,6 +184,17 @@ EOF
## create a test account ## create a test account
## ##
cat >$NSS_WRAPPER_PASSWD<<EOF
nobody:x:65534:65533:nobody gecos:$PREFIX_ABS:/bin/false
$USERNAME:x:$USERID:$GROUPID:$USERNAME gecos:$PREFIX_ABS:/bin/false
EOF
cat >$NSS_WRAPPER_GROUP<<EOF
nobody:x:65533:
nogroup:x:65534:nobody
$USERNAME-group:x:$GROUPID:
EOF
(echo $PASSWORD; echo $PASSWORD) | \ (echo $PASSWORD; echo $PASSWORD) | \
smbpasswd -c $CONFFILE -L -s -a $USERNAME >/dev/null || exit 1 smbpasswd -c $CONFFILE -L -s -a $USERNAME >/dev/null || exit 1