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

2 files changed, 7 insertions, 3 deletions

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 462517271b..72e9ddf020 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -888,7 +888,7 @@ sub setup_env($$)
 		        $testenv_vars->{target} = $target;
 		}
 		if (not defined($testenv_vars)) {
-			warn("$opt_target can't provide environment '$envname'");
+			warn("$opt_target can't start up known environment '$envname'");
 		}
 	}
 
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;