sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

selftest: simplify logic in setup_env

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2019-12-07 23:22:45 +13:00 committed by Andrew Bartlett
parent 131bfc8ce2
commit 4258f805f4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
selftest/selftest.pl
View File

@ -856,17 +856,19 @@ sub setup_env($$)
} }
} else { } else {
$testenv_vars = $target->setup_env($envname, $prefix); $testenv_vars = $target->setup_env($envname, $prefix);
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)) { if (not defined($testenv_vars)) {
my $msg = "$opt_target can't start up known environment '$envname'";
if ($opt_one) { if ($opt_one) {
die("$opt_target can't start up known environment '$envname'"); die($msg);
} else {
warn("$opt_target can't start up known environment '$envname'");
} }
warn $msg;
return;
}
if (ref $testenv_vars ne "HASH") {
return $testenv_vars;
}
if (defined($testenv_vars->{target})) {
$testenv_vars->{target} = $target;
} }
} }