sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r9613: remove TMPDIR from 'make test' scripts (after comments by Don Watson)

Browse Source 
(This used to be commit 0626bb68411225d5402221ec9b305390393c38e5)
This commit is contained in:
Gerald Carter 2005-08-25 12:44:37 +00:00 committed by Gerald (Jerry) Carter
parent e76107dd9b
commit 78f6ccebc5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/script/tests/runtests.sh
View File

@ -28,7 +28,7 @@ PASSWORD=test
SRCDIR=`pwd` SRCDIR=`pwd`
SCRIPTDIR=$SRCDIR/script/tests SCRIPTDIR=$SRCDIR/script/tests
TMPDIR=$PREFIX_ABS/tmp SHRDIR=$PREFIX_ABS/tmp
LIBDIR=$PREFIX_ABS/lib LIBDIR=$PREFIX_ABS/lib
PIDDIR=$PREFIX_ABS/pid PIDDIR=$PREFIX_ABS/pid
CONFFILE=$LIBDIR/smb.conf CONFFILE=$LIBDIR/smb.conf
@ -40,7 +40,7 @@ CONFIGURATION="-s $CONFFILE"
PATH=`pwd`/bin:$PATH PATH=`pwd`/bin:$PATH
export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR
export SRCDIR SCRIPTDIR export SRCDIR SCRIPTDIR
export USERNAME PASSWORD export USERNAME PASSWORD
@ -62,8 +62,7 @@ fi
## ##
/bin/rm -rf $PREFIX/* /bin/rm -rf $PREFIX/*
mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
chmod 1777 $TMPDIR
## ##
## Create the common config include file with the basic settings ## Create the common config include file with the basic settings

6
source3/script/tests/t_001.sh
View File

@ -8,7 +8,7 @@ cat >$CONFFILE<<EOF
smb ports = 139 smb ports = 139
[test] [test]
path = $TMPDIR path = $PREFIX_ABS/tmp
read only = no read only = no
EOF EOF
@ -16,6 +16,10 @@ EOF
## Test code ## Test code
## ##
/bin/rm -rf $PREFIX_ABS/tmp
mkdir $PREFIX_ABS/tmp
chmod 1777 $PREFIX_ABS/tmp
start_smbd || exit $? start_smbd || exit $?
smbclient $CONFIGURATION -L localhost -N -p 139 smbclient $CONFIGURATION -L localhost -N -p 139

7
source3/script/tests/t_002.sh
View File

@ -7,7 +7,7 @@ cat >$CONFFILE<<EOF
include = $LIBDIR/common.conf include = $LIBDIR/common.conf
[test] [test]
path = $TMPDIR path = $PREFIX_ABS/tmp
read only = no read only = no
EOF EOF
@ -15,6 +15,11 @@ EOF
## Test code ## Test code
## ##
/bin/rm -rf $PREFIX_ABS/tmp
mkdir $PREFIX_ABS/tmp
chmod 1777 $PREFIX_ABS/tmp
start_smbd || exit $? start_smbd || exit $?
smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS