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

(This used to be commit d062e101664a90f2f7bf0980449f920aa719ee76)

3 files changed, 12 insertions, 3 deletions

diff --git a/source4/script/tests/test_ejs.sh b/source4/script/tests/test_ejs.sh
index 3ad3ed2781..45b5fba528 100755
--- a/source4/script/tests/test_ejs.sh
+++ b/source4/script/tests/test_ejs.sh
@@ -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`
 
diff --git a/testprogs/ejs/base.js b/testprogs/ejs/base.js
index fddf64264c..3c998ee4f8 100755
--- a/testprogs/ejs/base.js
+++ b/testprogs/ejs/base.js
@@ -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();
diff --git a/testprogs/ejs/samba3sam.js b/testprogs/ejs/samba3sam.js
index 217ac6912a..446b39facf 100755
--- a/testprogs/ejs/samba3sam.js
+++ b/testprogs/ejs/samba3sam.js
@@ -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;