diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-03-06 06:30:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:18 -0500 |
| commit | 6376a474c7c873bfb0f9747d13056567c902635a (patch) | |
| tree | 318afc49f048289c2b97abc6e27db8bb0b07ecff /source4/script/tests/Samba4.pm | |
| parent | 3e1dd63927b6d50aa21f32ffaa41b320026be6a1 (diff) | |
| download | samba-6376a474c7c873bfb0f9747d13056567c902635a.tar.gz samba-6376a474c7c873bfb0f9747d13056567c902635a.tar.bz2 samba-6376a474c7c873bfb0f9747d13056567c902635a.zip | |
r21720: Try to make 'TEST_LDAP=yes make test' work again. These recent
changes seem to have been lost in the merge, and some variables were
not yet exported.
Andrew Bartlett
(This used to be commit ee9d9fb6c0bd3d4d01dea771025536ff83057072)
Diffstat (limited to 'source4/script/tests/Samba4.pm')
| -rw-r--r-- | source4/script/tests/Samba4.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm index defca23d9f..f81d75ffd3 100644 --- a/source4/script/tests/Samba4.pm +++ b/source4/script/tests/Samba4.pm @@ -16,17 +16,17 @@ use POSIX; sub slapd_start($$) { my ($conf, $uri) = @_; + # 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{FEDORA_DS_PREFIX}/lib/fedora-ds/ds_newinst.pl $ENV{FEDORA_DS_INF}") or die("Unable to provision fedora ds ldapd"); + system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $ENV{FEDORA_DS_DIR} -d0 &"); } else { my $oldpath = $ENV{PATH}; $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; - # running slapd in the background means it stays in the same process group, so it can be - # killed by timelimit system("slapd -d0 -f $conf -h $uri &"); $ENV{PATH} = $oldpath; } - return $? >> 8; + return 1; } sub slapd_stop() @@ -132,8 +132,8 @@ sub provision($) sub provision_ldap($$) { my ($bindir, $setupdir) = @_; - system("$bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAPI}") or - die("LDAP PROVISIONING failed: $bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAPI}"); + system("$bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAP_URI}") and + die("LDAP PROVISIONING failed: $bindir/smbscript $setupdir/provision $ENV{PROVISION_OPTIONS} \"$ENV{PROVISION_ACI}\" --ldap-backend=$ENV{LDAP_URI}"); } 1; |