mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 07:53:57 +08:00
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: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
4c1408962a
commit
9e842a5292
@ -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); }
|
||||
|
Loading…
Reference in New Issue
Block a user