selftest: Make overwrite of $env->{target} optional

This allows a target to be a mix of Samba3 and Samba4, and chose it's
own backend for check_env and get_log_env.

Andrew Bartlett

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index ec8ab2bec923b8fa24c0350c807bdb65b9b2f846..820bd9e19c9c38ed6de7917a23013606608c62ca 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -28,11 +28,15 @@ sub setup_env($$$)
 
        my $env = $self->{samba4}->setup_env($envname, $path);
        if (defined($env)) {
-           $env->{target} = $self->{samba4};
+           if (not defined($env->{target})) {
+               $env->{target} = $self->{samba4};
+           }
        } else {
                $env = $self->{samba3}->setup_env($envname, $path);
                if (defined($env)) {
-                   $env->{target} = $self->{samba3};
+                   if (not defined($env->{target})) {
+                       $env->{target} = $self->{samba3};
+                   }
                }
        }
        if (not defined $env) {