From 9e842a5292d035bf3dfa4bc70dd3270b104bdf57 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 27 Apr 2015 11:10:17 +0200 Subject: [PATCH] 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 --- util/mk1mf.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 454dcd2790..7b5705534d 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -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); } -- 2.25.1