summaryrefslogtreecommitdiff
path: root/source4/script/tests/test_ejs.sh
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-04-10 20:19:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:55 -0500
commite338b4b47b6271ca46060a1fe8c61ab8afaecc8f (patch)
tree315e3b28abd60f04f5d5a7cc871e6d246ef931f2 /source4/script/tests/test_ejs.sh
parent4cc500433d07decf8fc2551b117e15537f6c8558 (diff)
downloadsamba-e338b4b47b6271ca46060a1fe8c61ab8afaecc8f.tar.gz
samba-e338b4b47b6271ca46060a1fe8c61ab8afaecc8f.tar.bz2
samba-e338b4b47b6271ca46060a1fe8c61ab8afaecc8f.zip
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)
Diffstat (limited to 'source4/script/tests/test_ejs.sh')
-rwxr-xr-xsource4/script/tests/test_ejs.sh21
1 files changed, 5 insertions, 16 deletions
diff --git a/source4/script/tests/test_ejs.sh b/source4/script/tests/test_ejs.sh
index 4eba2de81a..858602ce38 100755
--- a/source4/script/tests/test_ejs.sh
+++ b/source4/script/tests/test_ejs.sh
@@ -1,17 +1,6 @@
#!/bin/sh
# test some simple EJS operations
-if [ $# -lt 3 ]; then
-cat <<EOF
-Usage: test_ejs.sh DOMAIN USERNAME PASSWORD [OPTIONS]
-EOF
-exit 1;
-fi
-
-DOMAIN="$1"
-USERNAME="$2"
-PASSWORD="$3"
-shift 3
CONFIGURATION="$*"
incdir=`dirname $0`
@@ -23,10 +12,10 @@ DATADIR=../testdata
PATH=bin:$PATH
export PATH
-plantest "base.js" rpc "$SCRIPTDIR/base.js" $CONFIGURATION
-plantest "samr.js" rpc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
-plantest "echo.js" rpc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
-plantest "ejsnet.js" rpc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
+plantest "base.js" dc "$SCRIPTDIR/base.js" $CONFIGURATION
+plantest "samr.js" dc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
+plantest "echo.js" dc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
+plantest "ejsnet.js" dc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser
plantest "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
plantest "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
-plantest "winreg" rpc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
+plantest "winreg" dc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD