diff options
Diffstat (limited to 'selftest/target')
| -rw-r--r-- | selftest/target/Samba.pm | 4 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 2 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 64bc405137..eea1987a4a 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -27,13 +27,13 @@ sub setup_env($$$) $ENV{ENVNAME} = $envname; my $env = $self->{samba4}->setup_env($envname, $path); - if (defined($env)) { + if (defined($env) and $env ne "UNKNOWN") { if (not defined($env->{target})) { $env->{target} = $self->{samba4}; } } else { $env = $self->{samba3}->setup_env($envname, $path); - if (defined($env)) { + if (defined($env) and $env ne "UNKNOWN") { if (not defined($env->{target})) { $env->{target} = $self->{samba3}; } diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index b710d5466d..7ecb481a46 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -112,7 +112,7 @@ sub setup_env($$$) } return $self->setup_member("$path/member", $self->{vars}->{s3dc}); } else { - return undef; + return "UNKNOWN"; } } diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 52c6d680d7..8ac3ee7eaf 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1429,7 +1429,7 @@ sub setup_env($$$) } elsif ($envname eq "plugin_s4_dc") { return $self->setup_plugin_s4_dc("$path/plugin_s4_dc"); } else { - return undef; + return "UNKNOWN"; } } |