selftest: Do not start up an already-running test environment

Otherwise we may re-provision the dc just because we started it via s3member or s4member
first.

Andrew Bartlett

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 7ecb481a467a2fe2f5482d89f1364c49990e000f..704d15d63265f8f3463767a30cdc8cec3b12e9a5 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -89,6 +89,10 @@ sub setup_env($$$)
 {
        my ($self, $envname, $path) = @_;
        
+       if (defined($self->{vars}->{$envname})) {
+               return $self->{vars}->{$envname};
+       }
+
        if ($envname eq "s3dc") {
                return $self->setup_s3dc("$path/s3dc");
        } elsif ($envname eq "secshare") {

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1838a893c5a78818624f71f3e90b4cf24644c108..87964a265c3561188b77cb48940f4e79ebfa1f19 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1388,6 +1388,10 @@ sub setup_env($$$)
 
        $ENV{ENVNAME} = $envname;
 
+       if (defined($self->{vars}->{$envname})) {
+               return $self->{vars}->{$envname};
+       }
+
        if ($envname eq "dc") {
                return $self->setup_dc("$path/dc");
        } elsif ($envname eq "fl2000dc") {