The branch OpenSSL_1_1_1-stable has been updated via b5aff22ac90623afeb0c74b36096f85eff5bc2b9 (commit) via a2a76471ee2ef7ed434fbc51c8e115052dad39e6 (commit) from fb97b8e8a52b853b2b2209d5aeee36eaa08bb9ad (commit)
- Log ----------------------------------------------------------------- commit b5aff22ac90623afeb0c74b36096f85eff5bc2b9 Author: Richard Levitte <levi...@openssl.org> Date: Fri Feb 5 15:32:42 2021 +0100 Configuration: ensure that 'no-tests' works correctly 'no-tests' wasn't entirely respected by test/build.info. Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14081) commit a2a76471ee2ef7ed434fbc51c8e115052dad39e6 Author: Richard Levitte <levi...@openssl.org> Date: Fri Feb 5 15:00:17 2021 +0100 configdata.pm: Better display of enabled/disabled options The options listed in the array @disablables are regular expressions. For most of them, it's not visible, but there are a few. However, configdata.pm didn't quite treat them that way, which meant that the few that are visibly regular expressions, there's a difference between that and the corresponding the key in %disabled, which is never a regular expression. To correctly display the enabled and disabled options with --dump, we must therefore go through a bit of Perl gymnastics to get the output correct enough, primarly so that disabled features don't look enabled. Fixes #13790 Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14081) ----------------------------------------------------------------------- Summary of changes: Configure | 19 +++++++++++-------- test/build.info | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Configure b/Configure index f25b84bff2..3173503b76 100755 --- a/Configure +++ b/Configure @@ -2611,19 +2611,22 @@ _____ } print "\nEnabled features:\n\n"; foreach my $what (@disablables) { - print " $what\n" unless $disabled{$what}; + print " $what\n" + unless grep { $_ =~ /^${what}$/ } keys %disabled; } print "\nDisabled features:\n\n"; foreach my $what (@disablables) { - if ($disabled{$what}) { - print " $what", ' ' x ($longest - length($what) + 1), - "[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1); - print $disabled_info{$what}->{macro} - if $disabled_info{$what}->{macro}; + my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled; + my $what3 = $what2[0]; + if ($what3) { + print " $what3", ' ' x ($longest - length($what3) + 1), + "[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1); + print $disabled_info{$what3}->{macro} + if $disabled_info{$what3}->{macro}; print ' (skip ', - join(', ', @{$disabled_info{$what}->{skipped}}), + join(', ', @{$disabled_info{$what3}->{skipped}}), ')' - if $disabled_info{$what}->{skipped}; + if $disabled_info{$what3}->{skipped}; print "\n"; } } diff --git a/test/build.info b/test/build.info index 7830ae1b7e..bc3dae81f9 100644 --- a/test/build.info +++ b/test/build.info @@ -567,7 +567,6 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN SOURCE[gosttest]=gosttest.c ssltestlib.c INCLUDE[gosttest]=../include .. DEPEND[gosttest]=../libcrypto ../libssl libtestutil.a -ENDIF SOURCE[ssl_ctx_test]=ssl_ctx_test.c INCLUDE[ssl_ctx_test]=../include @@ -609,3 +608,4 @@ _____ _____ } -} +ENDIF