diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-12-14 19:39:49 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-14 19:39:49 +0100 |
| commit | 9f2490c251991da316fb888947edf78024e5638a (patch) | |
| tree | 9afb09561c862a22e8e49afca615ee4b78649177 /source3 | |
| parent | ffe42b9015b7bbfeb917930b6a48423344adbe59 (diff) | |
| download | samba-9f2490c251991da316fb888947edf78024e5638a.tar.gz samba-9f2490c251991da316fb888947edf78024e5638a.tar.bz2 samba-9f2490c251991da316fb888947edf78024e5638a.zip | |
selftest: reenable wbinfo tests and pass --configfile instead of -s
metze
(This used to be commit 56251f78524416435299e26fca405e77d0f42043)
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/script/tests/selftest.sh | 2 | ||||
| -rwxr-xr-x | source3/script/tests/test_wbinfo_s3.sh | 2 | ||||
| -rwxr-xr-x | source3/script/tests/tests_all.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 6810ec1a54..2250a81245 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -49,7 +49,7 @@ PRIVATEDIR=$PREFIX_ABS/private LOCKDIR=$PREFIX_ABS/lockdir LOGDIR=$PREFIX_ABS/logs SOCKET_WRAPPER_DIR=$PREFIX/sw -CONFIGURATION="-s $CONFFILE" +CONFIGURATION="--configfile $CONFFILE" SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE" NSS_WRAPPER_PASSWD="$PRIVATEDIR/passwd" NSS_WRAPPER_GROUP="$PRIVATEDIR/group" diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh index abd6146e1a..6a8faa1f87 100755 --- a/source3/script/tests/test_wbinfo_s3.sh +++ b/source3/script/tests/test_wbinfo_s3.sh @@ -40,7 +40,7 @@ NEWIFS=$':' IFS=$NEWIFS for t in $tests; do IFS=$OLDIFS - testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $ADDARGS $t || failed=`expr $failed + 1` + testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $CONFIGURATION $ADDARGS $t || failed=`expr $failed + 1` IFS=$NEWIFS done IFS=$OLDIFS diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh index a110d60f98..12789aa926 100755 --- a/source3/script/tests/tests_all.sh +++ b/source3/script/tests/tests_all.sh @@ -2,7 +2,7 @@ $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?` $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` -#$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?` +$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?` SMBTORTURE4VERSION=`$SMBTORTURE4 --version` if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then |