diff options
author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2019-12-07 23:22:45 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2020-02-04 05:13:40 +0000 |
commit | 4258f805f4aefaac43ca938e3a0a11dc85340512 (patch) | |
tree | 6e11cab67013e45183f92c09651b5d5d4345e421 | |
parent | 131bfc8ce2f04f1888e3d9a36f3ac65b70ef0e84 (diff) | |
download | samba-4258f805f4aefaac43ca938e3a0a11dc85340512.tar.gz |
selftest: simplify logic in setup_env
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>
-rwxr-xr-x | selftest/selftest.pl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index fa4297316d9..087fcefc502 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -856,17 +856,19 @@ sub setup_env($$) } } else { $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)) { + my $msg = "$opt_target can't start up known environment '$envname'"; if ($opt_one) { - die("$opt_target can't start up known environment '$envname'"); - } else { - warn("$opt_target can't start up known environment '$envname'"); + die($msg); } + warn $msg; + return; + } + if (ref $testenv_vars ne "HASH") { + return $testenv_vars; + } + if (defined($testenv_vars->{target})) { + $testenv_vars->{target} = $target; } } |