diff options
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/tests/selftest.sh | 25 | ||||
| -rwxr-xr-x | source4/script/tests/test_nbt.sh | 9 |
2 files changed, 17 insertions, 17 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index a3bc6efdb9..2648e40b03 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -82,18 +82,15 @@ rm -rf $PREFIX/* mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR cat >$PRIVATEDIR/wins.ldif<<EOF -dn: name=127.0.0.1,CN=PARTNERS +dn: name=TORTURE_26,CN=PARTNERS objectClass: wreplPartner -name: 127.0.0.1 -address: 127.0.0.1 -pullRetryInterval: 100 -pullInterval: 200 -type: 0x2 +name: TORTURE_26 +address: 127.0.0.26 +pullInterval: 0 +pushChangeCount: 0 +type: 0x3 EOF -WREPL_TORTURE_OPTIONS= -export WREPL_TORTURE_OPTIONS - cat >$CONFFILE<<EOF [global] netbios name = $SERVER @@ -106,7 +103,7 @@ cat >$CONFFILE<<EOF setup directory = $SRCDIR/setup js include = $SRCDIR/scripting/libjs name resolve order = bcast - interfaces = lo* + interfaces = 127.0.0.1/8 tls enabled = $TLS_ENABLED panic action = $SRCDIR/script/gdb_backtrace %PID% %PROG% wins support = yes @@ -163,13 +160,17 @@ if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then CONFIGURATION="$CONFIGURATION --option=\"torture:progress=no\"" fi +SOCKET_WRAPPER_DEFAULT_IFACE=1 +export SOCKET_WRAPPER_DEFAULT_IFACE smbd_check_or_start # ensure any one smbtorture call doesn't run too long -TORTURE_OPTIONS="--maximum-runtime=300 $CONFIGURATION" +SOCKET_WRAPPER_DEFAULT_IFACE=26 +export SOCKET_WRAPPER_DEFAULT_IFACE +TORTURE_INTERFACES='127.0.0.26/8,127.0.0.27/8,127.0.0.28/8,127.0.0.29/8,127.0.0.30/8,127.0.0.31/8' +TORTURE_OPTIONS="--maximum-runtime=300 --option=interfaces=$TORTURE_INTERFACES $CONFIGURATION" export TORTURE_OPTIONS - START=`date` ( # give time for nbt server to register its names diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh index 1537617241..4ed510e081 100755 --- a/source4/script/tests/test_nbt.sh +++ b/source4/script/tests/test_nbt.sh @@ -18,12 +18,11 @@ SCRIPTDIR=../testprogs/ejs PATH=bin:$PATH export PATH -for f in NBT-REGISTER NBT-WINS; do - testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1` -done +testit "nmblookup -U $SERVER $SERVER" bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER || failed=`expr $failed + 1` +testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER || failed=`expr $failed + 1` -for f in NBT-WINSREPLICATION-QUICK; do - testit "$f" bin/smbtorture $TORTURE_OPTIONS $WREPL_TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1` +for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION-QUICK; do + testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1` done testok $0 $failed |