sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

s3-selftest: fix locktest9 in make selftest.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2010-06-17 15:01:01 +02:00
parent 14c8d319e3
commit 160d882f34
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/script/tests/selftest.sh
View File

@ -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

2
source3/script/tests/test_smbtorture_s3.sh
View File

@ -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

4
source3/script/tests/tests_all.sh
View File

@ -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 + $?`
}

4
source3/selftest/tests.sh
View File

@ -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"
)
(