summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-29 13:31:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:45 -0500
commit498166904d4785650b8a3b7ade41dcc499941802 (patch)
tree4a50c5a168a7f63ea60b21c5ecfdfe0c5b5e8ced
parentba204fe35089edc1a4910deda9ba1c44878e4cee (diff)
downloadsamba-498166904d4785650b8a3b7ade41dcc499941802.tar.gz
samba-498166904d4785650b8a3b7ade41dcc499941802.tar.bz2
samba-498166904d4785650b8a3b7ade41dcc499941802.zip
r22570: run the NBT tests against DC and MEMBER
metze (This used to be commit 307cee21e4fd56150bdee9f1bbc2a1f2c2440afc)
-rwxr-xr-xsource4/script/tests/test_nbt.sh21
-rwxr-xr-xsource4/script/tests/tests_all.sh3
2 files changed, 18 insertions, 6 deletions
diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh
index d821b868ad..ceac810922 100755
--- a/source4/script/tests/test_nbt.sh
+++ b/source4/script/tests/test_nbt.sh
@@ -9,11 +9,22 @@ SCRIPTDIR=../testprogs/ejs
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
diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh
index 45366186b5..7fb6efcc36 100755
--- a/source4/script/tests/tests_all.sh
+++ b/source4/script/tests/tests_all.sh
@@ -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"