r22156: - Lazy evaluate variable names.

- Don't set up environments until necessary

- Add --resetup-environment option

- Add 'none' environment
(This used to be commit ed0410309bfdefb0d31cb247c26b947956fb1137)

1 files changed, 3 insertions, 14 deletions

diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh
index c3a09d4fb1..95bfb9696c 100755
--- a/source4/script/tests/test_nbt.sh
+++ b/source4/script/tests/test_nbt.sh
@@ -1,17 +1,6 @@
 #!/bin/sh
 # test some NBT/WINS operations
 
-if [ $# -lt 1 ]; then
-cat <<EOF
-Usage: test_nbt.sh SERVER
-EOF
-exit 1;
-fi
-
-SERVER="$1"
-USERNAME="$2"
-PASSWORD="$3"
-
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
@@ -20,11 +9,11 @@ SCRIPTDIR=../testprogs/ejs
 PATH=bin:$PATH
 export PATH
 
-plantest "nmblookup -U $SERVER $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER
-plantest "nmblookup $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS $SERVER
+plantest "nmblookup -U \$SERVER \$SERVER" dc bin/nmblookup $TORTURE_OPTIONS -U \$SERVER \$SERVER
+plantest "nmblookup \$SERVER" dc bin/nmblookup $TORTURE_OPTIONS \$SERVER
 
 NBT_TESTS=`bin/smbtorture --list | grep ^NBT`
 
 for f in $NBT_TESTS; do
-    plantest "$f" netbios bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f -U$USERNAME%$PASSWORD 
+    plantest "$f" dc bin/smbtorture $TORTURE_OPTIONS //\$SERVER/_none_ $f -U\$USERNAME%\$PASSWORD 
 done