[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5a5b85d125795d9257876aee266e5b65875fae03 (commit)
      from  6a69e8694af23dae1d1927813932f4296d133416 (commit)


- Log -----------------------------------------------------------------
commit 5a5b85d125795d9257876aee266e5b65875fae03
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 10 00:41:53 2016 +0100

    descrip.mms.tmpl: Simplify fiddling of logical names record and statem
    
    Instead of enumerating exactly those files in test/ that include
    ../ssl/ssl_locl.h, assume they all do.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1891)

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

Summary of changes:
 Configurations/descrip.mms.tmpl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index d8c0d7a..5a6e8d1 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -63,12 +63,8 @@
   }
   my $sd1 = sourcedir("ssl","record");
   my $sd2 = sourcedir("ssl","statem");
-  my @ssl_locl_users =
-      ( "[.test]cipher_overhead_test.o",
-        "[.test]dtls_mtu_test.o",
-        "[.test]heartbeat_test.o",
-        "[.test]ssltest_old.o",
-        grep /^\[\.ssl\.(?:record|statem)\].*\.o$/, keys %{$unified_info{sources}} );
+  my @ssl_locl_users = grep(/^\[\.(?:ssl\.(?:record|statem)|test)\].*\.o$/,
+                            keys %{$unified_info{sources}});
   foreach (@ssl_locl_users) {
       (my $x = $_) =~ s|\.o$|.OBJ|;
       $unified_info{before}->{$x}