r22378: none needs to be checked first

metze
(This used to be commit 7688919ab879706450a745b59fe5ef2506c25943)

diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 2fa8075602077aa99ffde2bb13093a31ae495e37..a155220e030ff676572beab875dde4e0c90158d6 100755 (executable)
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -677,13 +677,13 @@ sub setup_env($)
        my ($envname) = @_;
 
        my $testenv_vars;
-       if (defined($running_envs{$envname})) {
+       if ($envname eq "none") {
+               $testenv_vars = {};
+       } elsif (defined($running_envs{$envname})) {
                $testenv_vars = $running_envs{$envname};
                if (not $target->check_env($testenv_vars)) {
                        $testenv_vars = undef;
                }
-       } elsif ($envname eq "none") {
-               $testenv_vars = {};
        } else {
                $testenv_vars = $target->setup_env($envname, $prefix);
        }