svn commit: samba r25914 - in branches/SAMBA_4_0/source/selftest: . env

[metze at samba.org]

Author: metze
Date: 2007-11-09 18:33:18 +0000 (Fri, 09 Nov 2007)
New Revision: 25914

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

Log:
selftest: fix the module pathes when using --with-selftest-prefix

metze

Modified:
   branches/SAMBA_4_0/source/selftest/env/Samba4.pm
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-11-09 10:26:32 UTC (rev 25913)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-11-09 18:33:18 UTC (rev 25914)
@@ -647,7 +647,6 @@
 		DOMAIN => $domain,
 		USERNAME => $username,
 		REALM => $realm,
-		LDB_MODULES_PATH => "$self->{bindir}/modules/ldb",
 		PASSWORD => $password,
 		LDAPDIR => $ldapdir,
 		WINBINDD_SOCKET_DIR => $winbindd_socket_dir,

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-11-09 10:26:32 UTC (rev 25913)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-11-09 18:33:18 UTC (rev 25914)
@@ -403,7 +403,7 @@
 
 my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
-$ENV{LD_LDB_MODULE_PATH} = "$old_pwd/bin/modules/ldb";
+$ENV{LDB_MODULE_PATH} = "$old_pwd/bin/modules/ldb";
 $ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/bin/modules";
 if (defined($ENV{LD_LIBRARY_PATH})) {
 	$ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared:$ENV{LD_LIBRARY_PATH}";
@@ -546,7 +546,7 @@
 	torture:basedir = $prefix_abs/client
 #We don't want to pass our self-tests if the PAC code is wrong
 	gensec:require_pac = true
-	modules dir = $prefix_abs/../bin/modules
+	modules dir = $ENV{LD_SAMBA_MODULE_PATH}
 ";
 	close(CF);
 }