svn commit: samba r22167 - in branches/SAMBA_4_0/source/script/tests: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-11 10:25:02 +0000 (Wed, 11 Apr 2007)
New Revision: 22167

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

Log:
This seems to get Fedora DS to run the tests again.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/tests/Samba4.pm


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-11 06:43:06 UTC (rev 22166)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-11 10:25:02 UTC (rev 22167)
@@ -27,7 +27,7 @@
 	# running slapd in the background means it stays in the same process group, so it can be
 	# killed by timelimit
 	if (defined($ENV{FEDORA_DS_PREFIX})) {
-	        system("$env_vars->{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $env_vars->{FEDORA_DS_DIR} -d$env_vars->{FEDORA_DS_LOGLEVEL} -i $env_vars->{FEDORA_DS_PIDFILE}> $env_vars->{LDAPDIR}/logs 2>&1 &");
+	        system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $env_vars->{FEDORA_DS_DIR} -d$env_vars->{FEDORA_DS_LOGLEVEL} -i $env_vars->{FEDORA_DS_PIDFILE}> $env_vars->{LDAPDIR}/logs 2>&1 &");
 	} else {
 		my $oldpath = $ENV{PATH};
 		$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
@@ -48,7 +48,7 @@
 sub slapd_stop($$)
 {
 	my ($self, $envvars) = @_;
-	if (defined($envvars->{FEDORA_DS_PREFIX})) {
+	if (defined($ENV{FEDORA_DS_PREFIX})) {
 		system("$envvars->{LDAPDIR}/slapd-samba4/stop-slapd");
 	} else {
 		open(IN, "<$envvars->{OPENLDAP_PIDFILE}") or