summaryrefslogtreecommitdiff
path: root/source4/script/tests/test_ejs.sh
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-03-21 15:57:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:37 -0500
commit2fca3f9082a70e1f153f6c9f195d95b0d48e363d (patch)
tree57146b03e224aede0bd6495beb3d5d717d424930 /source4/script/tests/test_ejs.sh
parente2f26316cdeba1875be2cd583870ac6127c2be56 (diff)
downloadsamba-2fca3f9082a70e1f153f6c9f195d95b0d48e363d.tar.gz
samba-2fca3f9082a70e1f153f6c9f195d95b0d48e363d.tar.bz2
samba-2fca3f9082a70e1f153f6c9f195d95b0d48e363d.zip
r21909: Merge some of my recent improvements to the test infrastructure:
- Allow tests to specify what environment they need to run in (dc and none are thecurrent supported ones). - Move more Samba4-specific code out of the common code (This used to be commit dbe9de10287c902f4a5ea5d431dea4a79f9b170b)
Diffstat (limited to 'source4/script/tests/test_ejs.sh')
-rwxr-xr-xsource4/script/tests/test_ejs.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/script/tests/test_ejs.sh b/source4/script/tests/test_ejs.sh
index 1ccbb323c0..f89c3556b4 100755
--- a/source4/script/tests/test_ejs.sh
+++ b/source4/script/tests/test_ejs.sh
@@ -23,12 +23,12 @@ DATADIR=../testdata
PATH=bin:$PATH
export PATH
-testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION
-testit "samr.js" "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
-testit "echo.js" "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
-testit "ejsnet.js" $SCRIPTDIR/ejsnet.js $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
-testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION
-testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
-testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
+testit "base.js" rpc "$SCRIPTDIR/base.js" $CONFIGURATION
+testit "samr.js" rpc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
+testit "echo.js" rpc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
+testit "ejsnet.js" rpc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
+testit "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
+testit "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+testit "winreg" rpc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
testok $0 $failed