From 324a77916752129b6b64b3596c493727b293fb52 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 20 Sep 2006 17:19:05 +0000 Subject: r18721: Fix base and samba3sam EJS tests to work without installation. (This used to be commit d062e101664a90f2f7bf0980449f920aa719ee76) --- testprogs/ejs/base.js | 8 ++++++++ testprogs/ejs/samba3sam.js | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'testprogs') 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; -- cgit