svn commit: samba r22570 - in branches/SAMBA_4_0/source/script/tests: .

[metze at samba.org]

Author: metze
Date: 2007-04-29 13:31:13 +0000 (Sun, 29 Apr 2007)
New Revision: 22570

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22570

Log:
run the NBT tests against DC and MEMBER

metze
Modified:
   branches/SAMBA_4_0/source/script/tests/test_nbt.sh
   branches/SAMBA_4_0/source/script/tests/tests_all.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2007-04-29 13:07:36 UTC (rev 22569)
+++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2007-04-29 13:31:13 UTC (rev 22570)
@@ -9,11 +9,22 @@
 PATH=bin:$PATH
 export PATH
 
-plantest "nmblookup -U \$SERVER \$SERVER" dc bin/nmblookup $TORTURE_OPTIONS -U \$SERVER \$SERVER
-plantest "nmblookup \$SERVER" dc bin/nmblookup $TORTURE_OPTIONS \$SERVER
+TEST_NBT_ENVNAME=$1
+if test x"$TEST_NBT_ENVNAME" = x"";then
+	TEST_NBT_ENVNAME="dc"
+fi
 
+plantest "nmblookup -U \$SERVER_IP \$SERVER" $TEST_NBT_ENVNAME bin/nmblookup $TORTURE_OPTIONS -U \$SERVER_IP \$SERVER
+plantest "nmblookup -U \$SERVER_IP \$NETBIOSNAME" $TEST_NBT_ENVNAME bin/nmblookup $TORTURE_OPTIONS -U \$SERVER_IP \$NETBIOSNAME
+plantest "nmblookup -U \$SERVER_IP \$NETBIOSALIAS" $TEST_NBT_ENVNAME bin/nmblookup $TORTURE_OPTIONS -U \$SERVER_IP \$NETBIOSALIAS
+plantest "nmblookup \$SERVER" $TEST_NBT_ENVNAME bin/nmblookup $TORTURE_OPTIONS \$SERVER
+plantest "nmblookup \$NETBIOSNAME" $TEST_NBT_ENVNAME bin/nmblookup $TORTURE_OPTIONS \$NETBIOSNAME
+plantest "nmblookup \$NETBIOSALIAS" $TEST_NBT_ENVNAME bin/nmblookup $TORTURE_OPTIONS \$NETBIOSALIAS
+
 NBT_TESTS=`bin/smbtorture --list | grep "^NBT-" | xargs`
 
-for f in $NBT_TESTS; do
-    plantest "$f" dc bin/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD 
-done
+if test x"$TEST_NBT_ENVNAME" = x"dc";then
+    for f in $NBT_TESTS; do
+        plantest "$f:$TEST_NBT_ENVNAME" $TEST_NBT_ENVNAME bin/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD 
+    done
+fi

Modified: branches/SAMBA_4_0/source/script/tests/tests_all.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/tests_all.sh	2007-04-29 13:07:36 UTC (rev 22569)
+++ branches/SAMBA_4_0/source/script/tests/tests_all.sh	2007-04-29 13:31:13 UTC (rev 22570)
@@ -1,7 +1,7 @@
 #!/bin/sh
  $SRCDIR/script/tests/test_ejs.sh $CONFIGURATION
  $SRCDIR/script/tests/test_ldap.sh 
- $SRCDIR/script/tests/test_nbt.sh
+ $SRCDIR/script/tests/test_nbt.sh "dc"
  $SRCDIR/script/tests/test_rpc.sh
  $SRCDIR/script/tests/test_net.sh
  $SRCDIR/script/tests/test_session_key.sh
@@ -15,3 +15,4 @@
  $SRCDIR/script/tests/test_simple.sh
  $SRCDIR/script/tests/test_s3upgrade.sh $PREFIX/upgrade
  $SRCDIR/script/tests/test_member.sh
+ $SRCDIR/script/tests/test_nbt.sh "member"