From 78f6ccebc584446823bdf3ae8435827328a74448 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 25 Aug 2005 12:44:37 +0000 Subject: r9613: remove TMPDIR from 'make test' scripts (after comments by Don Watson) (This used to be commit 0626bb68411225d5402221ec9b305390393c38e5) --- source3/script/tests/runtests.sh | 7 +++---- source3/script/tests/t_001.sh | 6 +++++- source3/script/tests/t_002.sh | 7 ++++++- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'source3/script') 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<$CONFFILE<