[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  1820084 s3:tests: move the log directory of the smbclient_s3 test to st/
       via  4ee1c7c s3:tests: clean up old log directories of the registry.roundtrip test
      from  2ba57fd s4:smbtorture do not leave output directory around

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 182008452381c126fb41984aa392b8b6e9010974
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 21 12:48:48 2011 +0100

    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 at samba.org>
    Autobuild-Date: Mon Feb 21 13:39:06 CET 2011 on sn-devel-104

commit 4ee1c7c493a868ac271fd4ca19218ec9de51b88a
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 21 12:48:15 2011 +0100

    s3:tests: clean up old log directories of the registry.roundtrip test

-----------------------------------------------------------------------

Summary of changes:
 .../script/tests/test_net_registry_roundtrip.sh    |   10 +++++++++-
 source3/script/tests/test_smbclient_s3.sh          |   15 ++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_net_registry_roundtrip.sh b/source3/script/tests/test_net_registry_roundtrip.sh
index 7f13bc2..88919ec 100755
--- a/source3/script/tests/test_net_registry_roundtrip.sh
+++ b/source3/script/tests/test_net_registry_roundtrip.sh
@@ -44,9 +44,11 @@ conf_roundtrip_step() {
 #    echo -n .
 }
 
+LOGDIR_PREFIX="conf_roundtrip"
+
 conf_roundtrip()
 {
-    local DIR=$(mktemp -d --tmpdir=$PREFIX conf_roundtrip_XXXX)
+    local DIR=$(mktemp -d --tmpdir=$PREFIX ${LOGDIR_PREFIX}_XXXX)
     local LOG=$DIR/log
 
     echo conf_roundtrip $1 > $LOG
@@ -98,6 +100,12 @@ conf_roundtrip()
 
 CONF_FILES=${CONF_FILES:-$(find $SRCDIR/ -name '*.conf' | xargs grep -l "\[global\]")}
 
+# remove old logs:
+for OLDDIR in $(find ${PREFIX} -type d -name "${LOGDIR_PREFIX}_*") ; do
+	echo "removing old directory ${OLDDIR}"
+	rm -rf ${OLDDIR}
+done
+
 for conf_file in $CONF_FILES
 do
     testit "conf_roundtrip $conf_file" \
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 08ed3b7..a7c0775 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`


-- 
Samba Shared Repository