diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-13 12:14:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-13 04:41:05 +0100 |
| commit | 70f4a96c68e91e407651e2487cc3c66a80262fa2 (patch) | |
| tree | 9fa08c334fd15299e8c02f55136b2009432beb26 /selftest/target/Samba.pm | |
| parent | 3bf922111a29277e390361c6f4cf7580ff4453e3 (diff) | |
| download | samba-70f4a96c68e91e407651e2487cc3c66a80262fa2.tar.gz samba-70f4a96c68e91e407651e2487cc3c66a80262fa2.tar.bz2 samba-70f4a96c68e91e407651e2487cc3c66a80262fa2.zip | |
selftest: Allow setup_env() to signal that an environment name is unknown
This will allow us to skip samba4 environments that may be mentioned in
the source3/selftest/tests.py file.
Andrew Bartlett
Diffstat (limited to 'selftest/target/Samba.pm')
| -rw-r--r-- | selftest/target/Samba.pm | 4 |
1 files changed, 2 insertions, 2 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}; } |