Commit b6f18d38 authored by Richard Levitte's avatar Richard Levitte
Browse files

Configure: make C++ build tests optional and configurable 



Disabled by default

Fixes #8360

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8370)

(cherry picked from commit ac4033d6)
parent 27a3be20

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ 














 Changes between 1.1.1b and 1.1.1c [xx XXX xxxx]



























  *) Added build tests for C++.  These are generated files that only do one













     thing, to include one public OpenSSL head file each.  This tests that













     the public header files can be usefully included in a C++ application.

























     This test isn't enabled by default.  It can be enabled with the option













     'enable-buildtest-c++'.













     [Richard Levitte]



























  *) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.















     This changes the size when using the genpkey app when no size is given. It















     fixes an omission in earlier changes that changed all RSA, DSA and DH

































Configure



+3
−1






























Original line number
Diff line number
Diff line








@@ -332,6 +332,7 @@ my @disablables = (













    "autoload-config",















    "bf",















    "blake2",













    "buildtest-c++",















    "camellia",















    "capieng",















    "cast",










@@ -432,6 +433,7 @@ my %deprecated_disablables = (





























our %disabled = ( # "what"         => "comment"















                  "asan"                => "default",













                  "buildtest-c++"       => "default",















                  "crypto-mdebug"       => "default",















                  "crypto-mdebug-backtrace" => "default",















                  "devcryptoeng"        => "default",










@@ -1167,7 +1169,7 @@ my %disabled_info = ();         # For configdata.pm













foreach my $what (sort keys %disabled) {















    $config{options} .= " no-$what";





























    if (!grep { $what eq $_ } ( 'threads', 'shared', 'pic',













    if (!grep { $what eq $_ } ( 'buildtest-c++', 'threads', 'shared', 'pic',















                                'dynamic-engine', 'makedepend',















                                'zlib-dynamic', 'zlib', 'sse2' )) {















        (my $WHAT = uc $what) =~ s|-|_|g;

































test/build.info



+1
−1






























Original line number
Diff line number
Diff line








@@ -585,7 +585,7 @@ ENDIF













  INCLUDE[buildtest_c_$name]=../include















  DEPEND[buildtest_c_$name]=../libssl ../libcrypto















_____













       $OUT .= <<"_____" if $config{CXX};













       $OUT .= <<"_____" if $config{CXX} && !$disabled{"buildtest-c++"};































  PROGRAMS_NO_INST=buildtest_cc_$name















  SOURCE[buildtest_cc_$name]=buildtest_$name.cc