diff options
| author | Gerald Carter <jerry@samba.org> | 2005-08-25 12:44:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:22 -0500 |
| commit | 78f6ccebc584446823bdf3ae8435827328a74448 (patch) | |
| tree | 00fd298a2b266209fb4de24018f065dd12fa2106 | |
| parent | e76107dd9b3f53009466f0067aed843905819e4e (diff) | |
| download | samba-78f6ccebc584446823bdf3ae8435827328a74448.tar.gz samba-78f6ccebc584446823bdf3ae8435827328a74448.tar.bz2 samba-78f6ccebc584446823bdf3ae8435827328a74448.zip | |
r9613: remove TMPDIR from 'make test' scripts (after comments by Don Watson)
(This used to be commit 0626bb68411225d5402221ec9b305390393c38e5)
| -rw-r--r-- | source3/script/tests/runtests.sh | 7 | ||||
| -rw-r--r-- | source3/script/tests/t_001.sh | 6 | ||||
| -rw-r--r-- | source3/script/tests/t_002.sh | 7 |
3 files changed, 14 insertions, 6 deletions
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh index bb599ea3ec..a5dc3ecfb4 100644 --- a/source3/script/tests/runtests.sh +++ b/source3/script/tests/runtests.sh @@ -28,7 +28,7 @@ PASSWORD=test SRCDIR=`pwd` SCRIPTDIR=$SRCDIR/script/tests -TMPDIR=$PREFIX_ABS/tmp +SHRDIR=$PREFIX_ABS/tmp LIBDIR=$PREFIX_ABS/lib PIDDIR=$PREFIX_ABS/pid CONFFILE=$LIBDIR/smb.conf @@ -40,7 +40,7 @@ CONFIGURATION="-s $CONFFILE" PATH=`pwd`/bin:$PATH 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 USERNAME PASSWORD @@ -62,8 +62,7 @@ fi ## /bin/rm -rf $PREFIX/* -mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR -chmod 1777 $TMPDIR +mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR ## ## Create the common config include file with the basic settings diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh index 995cfb11eb..6d54d0e489 100644 --- a/source3/script/tests/t_001.sh +++ b/source3/script/tests/t_001.sh @@ -8,7 +8,7 @@ cat >$CONFFILE<<EOF smb ports = 139 [test] - path = $TMPDIR + path = $PREFIX_ABS/tmp read only = no EOF @@ -16,6 +16,10 @@ EOF ## Test code ## +/bin/rm -rf $PREFIX_ABS/tmp +mkdir $PREFIX_ABS/tmp +chmod 1777 $PREFIX_ABS/tmp + start_smbd || exit $? smbclient $CONFIGURATION -L localhost -N -p 139 diff --git a/source3/script/tests/t_002.sh b/source3/script/tests/t_002.sh index 48987262a7..42070bed80 100644 --- a/source3/script/tests/t_002.sh +++ b/source3/script/tests/t_002.sh @@ -7,7 +7,7 @@ cat >$CONFFILE<<EOF include = $LIBDIR/common.conf [test] - path = $TMPDIR + path = $PREFIX_ABS/tmp read only = no EOF @@ -15,6 +15,11 @@ EOF ## Test code ## +/bin/rm -rf $PREFIX_ABS/tmp +mkdir $PREFIX_ABS/tmp +chmod 1777 $PREFIX_ABS/tmp + + start_smbd || exit $? smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS |