svn commit: samba r18721 - in branches/SAMBA_4_0: source/script/tests testprogs/ejs

[jelmer at samba.org]

Author: jelmer
Date: 2006-09-20 17:19:05 +0000 (Wed, 20 Sep 2006)
New Revision: 18721

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18721

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

Modified:
   branches/SAMBA_4_0/source/script/tests/test_ejs.sh
   branches/SAMBA_4_0/testprogs/ejs/base.js
   branches/SAMBA_4_0/testprogs/ejs/samba3sam.js


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_ejs.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_ejs.sh	2006-09-20 17:18:21 UTC (rev 18720)
+++ branches/SAMBA_4_0/source/script/tests/test_ejs.sh	2006-09-20 17:19:05 UTC (rev 18721)
@@ -21,7 +21,7 @@
 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 "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`
 

Modified: branches/SAMBA_4_0/testprogs/ejs/base.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/base.js	2006-09-20 17:18:21 UTC (rev 18720)
+++ branches/SAMBA_4_0/testprogs/ejs/base.js	2006-09-20 17:19:05 UTC (rev 18721)
@@ -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();

Modified: branches/SAMBA_4_0/testprogs/ejs/samba3sam.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/samba3sam.js	2006-09-20 17:18:21 UTC (rev 18720)
+++ branches/SAMBA_4_0/testprogs/ejs/samba3sam.js	2006-09-20 17:19:05 UTC (rev 18721)
@@ -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 @@
 	return rdn + ",sambaDomainName=TESTS," + this.BASEDN;
 }
 
+var ldb = ldb_init();
+
 sys = sys_init();
 var ldbfile = prefix + "/" + "test.ldb";
 var ldburl = "tdb://" + ldbfile;