summaryrefslogtreecommitdiff
path: root/source3/script/tests
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-02-21 12:48:48 +0100
committerMichael Adam <obnox@samba.org>2011-02-21 13:39:06 +0100
commit182008452381c126fb41984aa392b8b6e9010974 (patch)
tree73310cf9d089041e0634903af15e65a69a88fa57 /source3/script/tests
parent4ee1c7c493a868ac271fd4ca19218ec9de51b88a (diff)
downloadsamba-182008452381c126fb41984aa392b8b6e9010974.tar.gz
samba-182008452381c126fb41984aa392b8b6e9010974.tar.bz2
samba-182008452381c126fb41984aa392b8b6e9010974.zip
s3:tests: move the log directory of the smbclient_s3 test to st/
And use a proper mktemp call to create a unique name. The old location under /tmp/ was bad. Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Mon Feb 21 13:39:06 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/script/tests')
-rwxr-xr-xsource3/script/tests/test_smbclient_s3.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 08ed3b7729..a7c07753ad 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -389,15 +389,16 @@ test_ccache_access()
$WBINFO --logoff
}
-LOGDIR=/tmp/log.test_smbclient_s3.$$
+LOGDIR_PREFIX=test_smbclient_s3
-testit "rm -rf $LOGDIR" \
- rm -rf $LOGDIR || \
- exit 1
+# possibly remove old logdirs:
+
+for OLDDIR in $(find ${PREFIX} -type d -name "${LOGDIR_PREFIX}_*") ; do
+ echo "removing old directory ${OLDDIR}"
+ rm -rf ${OLDDIR}
+done
-testit "mkdir -p $LOGDIR" \
- mkdir -p $LOGDIR || \
- exit 1
+LOGDIR=$(mktemp -d --tmpdir=$PREFIX ${LOGDIR_PREFIX}_XXXX)
testit "smbclient -L $SERVER_IP" $SMBCLIENT $CONFIGURATION -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`