[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e60a748a13a244e8b13bacca18bad9bb3505aa90 (commit)
      from  3f71add9e57fb48cb5efdc765860daf754db40e9 (commit)


- Log -----------------------------------------------------------------
commit e60a748a13a244e8b13bacca18bad9bb3505aa90
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 5 15:39:32 2021 +0100

    Configuration: ensure that 'no-tests' works correctly
    
    'no-tests' wasn't entirely respected when specifying subdirs in the
    top build.info.
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14082)

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

Summary of changes:
 build.info | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.info b/build.info
index 053329c682..f631d6c780 100644
--- a/build.info
+++ b/build.info
@@ -1,7 +1,10 @@
 # Note that some of these directories are filtered in Configure.  Look for
 # %skipdir there for further explanations.
 
-SUBDIRS=crypto ssl apps test util tools fuzz providers doc
+SUBDIRS=crypto ssl apps util tools fuzz providers doc
+IF[{- !$disabled{tests} -}]
+  SUBDIRS=test
+ENDIF
 IF[{- !$disabled{'deprecated-3.0'} -}]
   SUBDIRS=engines
 ENDIF