mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
selftest: reenable wbinfo tests and pass --configfile instead of -s
metze
This commit is contained in:
parent
33cbd6903e
commit
56251f7852
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user