From e338b4b47b6271ca46060a1fe8c61ab8afaecc8f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 10 Apr 2007 20:19:31 +0000
Subject: 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)
---
 source4/script/tests/test_blackbox.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'source4/script/tests/test_blackbox.sh')

diff --git a/source4/script/tests/test_blackbox.sh b/source4/script/tests/test_blackbox.sh
index dd6c31c436..ea50761d9a 100755
--- a/source4/script/tests/test_blackbox.sh
+++ b/source4/script/tests/test_blackbox.sh
@@ -2,23 +2,19 @@
 
 # this runs tests that interact directly with the command-line tools rather than using the API
 
-if [ $# -lt 5 ]; then
+if [ $# -lt 1 ]; then
 cat <<EOF
-Usage: test_blackbox.sh SERVER USERNAME PASSWORD DOMAIN PREFIX [...]
+Usage: test_blackbox.sh PREFIX [...]
 EOF
 exit 1;
 fi
 
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-ADDARGS="$@"
+PREFIX=$1
+shift 1
+ADDARGS="$*"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-plantest "blackbox.smbclient" smb $incdir/../../../testprogs/blackbox/test_smbclient.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.cifsdd" smb $incdir/../../../testprogs/blackbox/test_cifsdd.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$ADDARGS"
+plantest "blackbox.smbclient" dc $incdir/../../../testprogs/blackbox/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
+plantest "blackbox.cifsdd" dc $incdir/../../../testprogs/blackbox/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
-- 
cgit