[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  160d882... s3-selftest: fix locktest9 in make selftest.
      from  14c8d31... s3:configure: use cc for linking on IRIX and fix shlib usage

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


- Log -----------------------------------------------------------------
commit 160d882f34cee6c74e5d289dd2fcebb97037a008
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jun 17 15:01:01 2010 +0200

    s3-selftest: fix locktest9 in make selftest.
    
    Guenther

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

Summary of changes:
 source3/script/tests/selftest.sh           |    2 ++
 source3/script/tests/test_smbtorture_s3.sh |    2 +-
 source3/script/tests/tests_all.sh          |    4 ++--
 source3/selftest/tests.sh                  |    4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 54b1c9c..cf7a9fe 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -105,6 +105,7 @@ NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
 WINBINDD_SOCKET_DIR=$PREFIX_ABS/winbindd
 WINBINDD_PRIV_PIPE_DIR=$LOCKDIR/winbindd_privileged
 TEST_DIRECTORY=$DIRECTORY
+LOCAL_PATH=$SHRDIR
 
 export PREFIX PREFIX_ABS
 export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
@@ -116,6 +117,7 @@ export WORKGROUP SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 export TEST_DIRECTORY
+export LOCAL_PATH
 
 PATH=bin:$PATH
 export PATH
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 851e58a..1abf7b6 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -54,7 +54,7 @@ for t in $tests; do
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND $BINDIR/smbtorture $unc -U"$username"%"$password" -l"$PREFIX_ABS"/tmp $ADDARGS $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND $BINDIR/smbtorture $unc -U"$username"%"$password" $ADDARGS $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index cd0c6eb..ccc5e06 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -7,14 +7,14 @@ local_s3() {
 smbtorture_s3() {
 	echo "RUNNING TESTS smbtorture_s3"
 	$SCRIPTDIR/test_smbtorture_s3.sh \
-		//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
+		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-l $PREFIX_ABS/tmp" \
 	|| failed=`expr $failed + $?`
 }
 
 smbtorture_s3_encrypted() {
 	echo "RUNNING TESTS smbtorture_s3_encrypted"
 	$SCRIPTDIR/test_smbtorture_s3.sh \
-		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" \
+		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" "-l $PREFIX_ABS/tmp" \
 	|| failed=`expr $failed + $?`
 }
 
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index d2af4b2..c346426 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -92,14 +92,14 @@ export PASSWORD
 	shift $#
 	testitprefix="smbtorture_s3.plain."
 	testitenv="dc"
-	. $SCRIPTDIR/test_smbtorture_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" ""
+	. $SCRIPTDIR/test_smbtorture_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" "" "-l \$LOCAL_PATH"
 )
 
 (
 	shift $#
 	testitprefix="smbtorture_s3.crypt."
 	testitenv="dc"
-	. $SCRIPTDIR/test_smbtorture_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" "-e"
+	. $SCRIPTDIR/test_smbtorture_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" "-e" "-l \$LOCAL_PATH"
 )
 
 (


-- 
Samba Shared Repository