提交 9e842a52 编写于 作者: R Richard Levitte

Fix the check of test apps in util/mk1mf.pl

The previous check assumed that the variables for each test app, ending
with TEST would be indication enough.  Experience showed that this isn't
the best way.  Instead, simply look for the EXE variable in test/Makefile.
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 4c140896
......@@ -396,8 +396,15 @@ for (;;)
if ($key eq "EX_LIBS")
{ $ex_libs .= " $val" if $val ne "";}
if ($key =~ /^[A-Z0-9_]*TEST$/ && (!$fipscanisteronly || $dir =~ /^fips/ ))
{ $test.=&var_add($dir,$val, 0); }
# There was a condition here before:
# !$fipscanisteronly || $dir =~ /^fips/
# It currently fills no function and needs to be rewritten anyway, so
# removed for now.
if ($dir eq "test" && $key eq "EXE")
{
foreach my $t (split /\s+/, $val) {
$test.=&var_add($dir,$t, 0) if $t; }
}
if ($key eq "EXE_OBJ")
{ $e_exe.=&var_add($dir,$val, 0); }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册