From 70f4a96c68e91e407651e2487cc3c66a80262fa2 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Feb 2012 12:14:57 +1100
Subject: 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
---
 selftest/selftest.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'selftest/selftest.pl')

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index e5ccbd8f37..462517271b 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -882,7 +882,9 @@ sub setup_env($$)
 		}
 	} else {
 		$testenv_vars = $target->setup_env($envname, $prefix);
-		if (defined($testenv_vars) && not defined($testenv_vars->{target})) {
+		if (defined($testenv_vars) and $testenv_vars eq "UNKNOWN") {
+		    return $testenv_vars;
+		} elsif (defined($testenv_vars) && not defined($testenv_vars->{target})) {
 		        $testenv_vars->{target} = $target;
 		}
 		if (not defined($testenv_vars)) {
@@ -1024,6 +1026,11 @@ $envvarstr
 			Subunit::end_testsuite($name, "error",
 				"unable to set up environment $envname - exiting");
 			next;
+		} elsif ($envvars eq "UNKNOWN") {
+			Subunit::start_testsuite($name);
+			Subunit::end_testsuite($name, "skip",
+				"environment $envname is unknown in this test backend - skipping");
+			next;
 		}
 
 		# Generate a file with the individual tests to run, if the 
-- 
cgit