summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-03-07 20:33:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:23 -0500
commit35a606378d4491d6fbd0e4b45fd460989bb83a36 (patch)
tree297bfc8fde3033745d566564866b9f76b17931b2
parent548ffe7cf6856c7295daf3344a734a23119315df (diff)
downloadsamba-35a606378d4491d6fbd0e4b45fd460989bb83a36.tar.gz
samba-35a606378d4491d6fbd0e4b45fd460989bb83a36.tar.bz2
samba-35a606378d4491d6fbd0e4b45fd460989bb83a36.zip
r21751: These 2 tests pass for me, so add them to the standard test script.
Andrew Bartlett (This used to be commit 8a5b3067e9ec8d7810687cd0a4909c02bdb86d15)
-rw-r--r--source4/samba4-skip2
-rwxr-xr-xsource4/script/tests/test_nbt.sh4
-rwxr-xr-xsource4/script/tests/tests_all.sh2
-rwxr-xr-xsource4/script/tests/tests_quick.sh2
4 files changed, 5 insertions, 5 deletions
diff --git a/source4/samba4-skip b/source4/samba4-skip
index dd61d99c0b..4c22cafa87 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -17,5 +17,3 @@ RAW-SAMBA3BADPATH
RAW-SCAN-EAMAX
SMB2-LOCK
SMB2-NOTIFY
-LOCAL-RESOLVE
-NBT-DGRAM
diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh
index b81dd49f74..90bd827c90 100755
--- a/source4/script/tests/test_nbt.sh
+++ b/source4/script/tests/test_nbt.sh
@@ -9,6 +9,8 @@ exit 1;
fi
SERVER="$1"
+USERNAME="$2"
+PASSWORD="$3"
incdir=`dirname $0`
. $incdir/test_functions.sh
@@ -24,7 +26,7 @@ testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER
NBT_TESTS=`bin/smbtorture --list | grep ^NBT`
for f in $NBT_TESTS; do
- testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f
+ testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f -U$USERNAME%$PASSWORD
done
testok $0 $failed
diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh
index fe00bf966d..79694df98e 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 $DOMAIN $USERNAME $PASSWORD $CONFIGURATION
$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
- $SRCDIR/script/tests/test_nbt.sh $SERVER
+ $SRCDIR/script/tests/test_nbt.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME
diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
index 87ecfd2cde..703f9dc294 100755
--- a/source4/script/tests/tests_quick.sh
+++ b/source4/script/tests/tests_quick.sh
@@ -4,7 +4,7 @@ export TORTURE_QUICK
$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD $CONFIGURATION
$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
-$SRCDIR/script/tests/test_nbt.sh $SERVER
+$SRCDIR/script/tests/test_nbt.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD ""
$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN
#$SRCDIR/script/tests/test_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?`