svn commit: samba r9613 - in
branches/SAMBA_3_0/source/script/tests: .
jerry at samba.org
jerry at samba.org
Thu Aug 25 12:44:37 GMT 2005
Author: jerry
Date: 2005-08-25 12:44:37 +0000 (Thu, 25 Aug 2005)
New Revision: 9613
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9613
Log:
remove TMPDIR from 'make test' scripts (after comments by Don Watson)
Modified:
branches/SAMBA_3_0/source/script/tests/runtests.sh
branches/SAMBA_3_0/source/script/tests/t_001.sh
branches/SAMBA_3_0/source/script/tests/t_002.sh
Changeset:
Modified: branches/SAMBA_3_0/source/script/tests/runtests.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/runtests.sh 2005-08-25 11:39:23 UTC (rev 9612)
+++ branches/SAMBA_3_0/source/script/tests/runtests.sh 2005-08-25 12:44:37 UTC (rev 9613)
@@ -28,7 +28,7 @@
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 @@
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 @@
##
/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
Modified: branches/SAMBA_3_0/source/script/tests/t_001.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/t_001.sh 2005-08-25 11:39:23 UTC (rev 9612)
+++ branches/SAMBA_3_0/source/script/tests/t_001.sh 2005-08-25 12:44:37 UTC (rev 9613)
@@ -8,7 +8,7 @@
smb ports = 139
[test]
- path = $TMPDIR
+ path = $PREFIX_ABS/tmp
read only = no
EOF
@@ -16,6 +16,10 @@
## 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
Modified: branches/SAMBA_3_0/source/script/tests/t_002.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/t_002.sh 2005-08-25 11:39:23 UTC (rev 9612)
+++ branches/SAMBA_3_0/source/script/tests/t_002.sh 2005-08-25 12:44:37 UTC (rev 9613)
@@ -7,7 +7,7 @@
include = $LIBDIR/common.conf
[test]
- path = $TMPDIR
+ path = $PREFIX_ABS/tmp
read only = no
EOF
@@ -15,6 +15,11 @@
## 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
More information about the samba-cvs
mailing list