diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-11-07 15:36:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:53 -0500 |
| commit | 14b59bcbec1a288810efee5c9442dff30f1a474a (patch) | |
| tree | e3415521f54225a33c912ddf4deaed2b4457100c /source4/script/tests | |
| parent | a8d741b4f7f83485178aedf7ca8068b3420ee93c (diff) | |
| download | samba-14b59bcbec1a288810efee5c9442dff30f1a474a.tar.gz samba-14b59bcbec1a288810efee5c9442dff30f1a474a.tar.bz2 samba-14b59bcbec1a288810efee5c9442dff30f1a474a.zip | |
r11555: - change socket_wrapper to support multiple IP's
- SOCKET_WRAPPER_DEFAULT_IFACE=X specifies the default interface
for 127.0.0.X
- we now use multiple interfaces for smbtorture in make test
127.0.0.26-127.0.0.31
- and 127.0.0.1 only for smbd
the are more work needed for better support for broacast messages...
but this is enough for the winsrepl tests
metze
(This used to be commit dbd01110d1a3e0f5914ae8d156723d6d6edf160c)
Diffstat (limited to 'source4/script/tests')
| -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 |