summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-19 15:05:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:10 -0500
commitfefc459b8f17f85f22eea1eed6e60059cb2ac04e (patch)
treec1ccf19bdaa489d565528b7d997dcae4edf1dabb
parente4fb7098cd8b9ddd51d6405c5c5a979658779af5 (diff)
downloadsamba-fefc459b8f17f85f22eea1eed6e60059cb2ac04e.tar.gz
samba-fefc459b8f17f85f22eea1eed6e60059cb2ac04e.tar.bz2
samba-fefc459b8f17f85f22eea1eed6e60059cb2ac04e.zip
r22378: none needs to be checked first
metze (This used to be commit 7688919ab879706450a745b59fe5ef2506c25943)
-rwxr-xr-xsource4/script/tests/selftest.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 2fa8075602..a155220e03 100755
--- 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);
}