summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-08-27 14:36:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:02:52 -0500
commita73a8d4b9d09b5bb98b58f23196bd44263158cde (patch)
tree5ed66b47c4e0b42b295edcee5d379e9eb73ee897 /source4/selftest
parentbcfef9f04b694d38130beaf6184db7064132c9f3 (diff)
downloadsamba-a73a8d4b9d09b5bb98b58f23196bd44263158cde.tar.gz
samba-a73a8d4b9d09b5bb98b58f23196bd44263158cde.tar.bz2
samba-a73a8d4b9d09b5bb98b58f23196bd44263158cde.zip
r24706: Move nmblookup tests to separate blackbox testsuite.
(This used to be commit aeb2e714f22abe68f89218967a55d7abd2d04ae1)
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/test_blackbox.sh10
-rwxr-xr-xsource4/selftest/test_nbt.sh7
2 files changed, 7 insertions, 10 deletions
diff --git a/source4/selftest/test_blackbox.sh b/source4/selftest/test_blackbox.sh
index 0f5f87614a..e8f01f2fae 100755
--- a/source4/selftest/test_blackbox.sh
+++ b/source4/selftest/test_blackbox.sh
@@ -16,6 +16,10 @@ ADDARGS="$*"
incdir=`dirname $0`
. $incdir/test_functions.sh
-plantest "blackbox.smbclient" dc $incdir/../../testprogs/blackbox/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.kinit" dc $incdir/../../testprogs/blackbox/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.cifsdd" dc $incdir/../../testprogs/blackbox/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
+bbdir=$incdir/../../testprogs/blackbox
+
+plantest "blackbox.smbclient" dc $bbdir/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
+plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" "$ADDARGS"
+plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
+plantest "blackbox.nmblookup:dc" dc $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" $ADDARGS
+plantest "blackbox.nmblookup:member" member $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" $ADDARGS
diff --git a/source4/selftest/test_nbt.sh b/source4/selftest/test_nbt.sh
index cfc1ee31cb..1ff5ee641d 100755
--- a/source4/selftest/test_nbt.sh
+++ b/source4/selftest/test_nbt.sh
@@ -12,13 +12,6 @@ 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`
if test x"$TEST_NBT_ENVNAME" = x"dc";then