r21751: These 2 tests pass for me, so add them to the standard test script.

Andrew Bartlett

diff --git a/source/samba4-skip b/source/samba4-skip
index dd61d99c0bdc7af1bc96eb258b90b56d66f9bc3d..4c22cafa873bf726d550bfeed4b47832c891f90c 100644 (file)
--- a/source/samba4-skip
+++ b/source/samba4-skip
@@ -17,5 +17,3 @@ RAW-SAMBA3BADPATH
 RAW-SCAN-EAMAX
 SMB2-LOCK
 SMB2-NOTIFY
-LOCAL-RESOLVE
-NBT-DGRAM

diff --git a/source/script/tests/test_nbt.sh b/source/script/tests/test_nbt.sh
index b81dd49f74733754c2cf83b77702c4ec6fc4a5c6..90bd827c9029e30f34a58510cddf4c6b2e103100 100755 (executable)
--- a/source/script/tests/test_nbt.sh
+++ b/source/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/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh
index fe00bf966d140a30ee475e508717282423aceddd..79694df98ee32d57f61e9241083ca93575b1f28c 100755 (executable)
--- a/source/script/tests/tests_all.sh
+++ b/source/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/source/script/tests/tests_quick.sh b/source/script/tests/tests_quick.sh
index 87ecfd2cde702f7529baf8712f7c1978dd0513a6..703f9dc2945164c0c619738722f7595102971f9a 100755 (executable)
--- a/source/script/tests/tests_quick.sh
+++ b/source/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 + $?`