diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-23 16:34:47 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-23 10:55:20 +0100 |
| commit | 6f8f24c5f2564cf0d0f742af556e3f641803efbd (patch) | |
| tree | 2450b4d2630f8b500789385bb67898e8b330d787 /selftest/target/Samba.pm | |
| parent | c623b4bbb8963baf82d1582abe29b7d54d09397c (diff) | |
| download | samba-6f8f24c5f2564cf0d0f742af556e3f641803efbd.tar.gz samba-6f8f24c5f2564cf0d0f742af556e3f641803efbd.tar.bz2 samba-6f8f24c5f2564cf0d0f742af556e3f641803efbd.zip | |
selftest: Do not skip environments that fail to start up
This is a regression in 70f4a96c68e91e407651e2487cc3c66a80262fa2.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Feb 23 10:55:20 CET 2012 on sn-devel-104
Diffstat (limited to 'selftest/target/Samba.pm')
| -rw-r--r-- | selftest/target/Samba.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index eea1987a4a..445cbb250d 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -31,7 +31,7 @@ sub setup_env($$$) if (not defined($env->{target})) { $env->{target} = $self->{samba4}; } - } else { + } elsif (defined($env) and $env eq "UNKNOWN") { $env = $self->{samba3}->setup_env($envname, $path); if (defined($env) and $env ne "UNKNOWN") { if (not defined($env->{target})) { @@ -39,8 +39,12 @@ sub setup_env($$$) } } } - if (not defined $env) { + if (defined($env) and ($env eq "UNKNOWN")) { warn("Samba can't provide environment '$envname'"); + return "UNKNOWN"; + } + if (not defined $env) { + warn("failed to start up environment '$envname'"); return undef; } return $env; |