summaryrefslogtreecommitdiff
path: root/testprogs/ejs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-20 17:19:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:19:04 -0500
commit324a77916752129b6b64b3596c493727b293fb52 (patch)
treef790e95e1cf54c44584d812404168735ba065405 /testprogs/ejs
parent6ca895542a629de2049609d290d3020c133e15a7 (diff)
downloadsamba-324a77916752129b6b64b3596c493727b293fb52.tar.gz
samba-324a77916752129b6b64b3596c493727b293fb52.tar.bz2
samba-324a77916752129b6b64b3596c493727b293fb52.zip
r18721: Fix base and samba3sam EJS tests to work without installation.
(This used to be commit d062e101664a90f2f7bf0980449f920aa719ee76)
Diffstat (limited to 'testprogs/ejs')
-rwxr-xr-xtestprogs/ejs/base.js8
-rwxr-xr-xtestprogs/ejs/samba3sam.js3
2 files changed, 10 insertions, 1 deletions
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;