s3-selftest: fix locktest9 in make selftest.

Guenther

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 54b1c9c38060ec5ac908790c1d59763f092e71c1..cf7a9fe704a5de1369484da474f6cd7f86ccbee1 100755 (executable)
--- 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 851e58a47cf96f82bf9bcf98593713bf7d7749d4..1abf7b6d8f23c176cc7916cbe8751d03dfe1c9c3 100755 (executable)
--- 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 cd0c6eb4566622314ccbda9f4ca5ee1690698c09..ccc5e06afb35134fa03c750daed2bde9f64afb8c 100755 (executable)
--- 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 d2af4b2dadbd3864f478f94b9b6134072fb8a063..c346426bf0c6bf60c4929340a2d65b32065aff47 100755 (executable)
--- 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"
 )
 
 (