sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r18721: Fix base and samba3sam EJS tests to work without installation.

Browse Source
This commit is contained in:
Jelmer Vernooij 2006-09-20 17:19:05 +00:00 committed by Gerald (Jerry) Carter
parent 5c0451842b
commit d062e10166
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/script/tests/test_ejs.sh
View File

@ -21,7 +21,7 @@ DATADIR=../testdata
PATH=bin:$PATH
export PATH
testit "base.js" $SCRIPTDIR/base.js || failed=`expr $failed + 1`
testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION || failed=`expr $failed + 1`
for f in samr.js echo.js; do
testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
@ -31,7 +31,7 @@ testit "ejsnet.js" $SCRIPTDIR/ejsnet.js $CONFIGURATION -U$USERNAME%$PASSWORD $DO
testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION || failed=`expr $failed + 1`
testit "samba3sam.js" $SCRIPTDIR/samba3sam.js `pwd` $DATADIR/samba3/ || failed=`expr $failed + 1`
testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/ || failed=`expr $failed + 1`
testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`

8
testprogs/ejs/base.js
View File

@ -1,5 +1,13 @@
#!/bin/sh
exec smbscript "$0" ${1+"$@"}
var options = GetOptions(ARGV,
"POPT_COMMON_SAMBA");
if (options == undefined) {
println("Failed to parse options");
return -1;
}
libinclude("base.js");
var obj = new Object();

3
testprogs/ejs/samba3sam.js
View File

@ -7,7 +7,6 @@
*/
var sys;
var ldb = ldb_init();
var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA");
if (options == undefined) {
println("Failed to parse options");
@ -1108,6 +1107,8 @@ function make_dn(rdn)
return rdn + ",sambaDomainName=TESTS," + this.BASEDN;
}
var ldb = ldb_init();
sys = sys_init();
var ldbfile = prefix + "/" + "test.ldb";
var ldburl = "tdb://" + ldbfile;