[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3830c1943b6b7411134a28c5801e57d1b5b2dca2 (commit)
      from  7d7f6834e542e53f604b46a72d57fad773d4b2bc (commit)


- Log -----------------------------------------------------------------
commit 3830c1943b6b7411134a28c5801e57d1b5b2dca2
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Mar 19 18:54:27 2018 +0100

    Don't generate buildtest_*err.c
    
    The error string header files aren't supposed to be included directly,
    so there's no point testing that they can.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5678)

-----------------------------------------------------------------------

Summary of changes:
 test/build.info | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/build.info b/test/build.info
index 085f0fa..2a7ea74 100644
--- a/test/build.info
+++ b/test/build.info
@@ -528,6 +528,7 @@ ENDIF
    my @nogo_headers = ( "asn1_mac.h",
                         "__decc_include_prologue.h",
                         "__decc_include_epilogue.h" );
+   my @nogo_headers_re = ( qr/.*err\.h/ );
    my @headerfiles = glob catfile($sourcedir,
                                   updir(), "include", "openssl", "*.h");
 
@@ -535,6 +536,7 @@ ENDIF
        my $name = basename($headerfile, ".h");
        next if $disabled{$name};
        next if grep { $_ eq lc("$name.h") } @nogo_headers;
+       next if grep { lc("$name.h") =~ m/$_/i } @nogo_headers_re;
        $OUT .= <<"_____";
 
   PROGRAMS_NO_INST=buildtest_$name