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

(This used to be commit 0626bb68411225d5402221ec9b305390393c38e5)

diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index bb599ea3ecb3e56c4a0a55929265afa8971b69dd..a5dc3ecfb4a1232f6a27a3d8db1991f71155aabc 100644 (file)
--- 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 995cfb11eb479d67e3d064e377062a7a81e7c9e4..6d54d0e4895a70e2b23b282c98660a57e180c4fb 100644 (file)
--- 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 48987262a733dbab804f2dffcc987e06caa4e667..42070bed80a9962f92bc58877ecc686b7b021395 100644 (file)
--- 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