[openssl] master update

Matt Caswell matt at openssl.org
Mon Feb 22 12:24:33 UTC 2021


The branch master has been updated
       via  f16f363a85baa6338744e20671c5a227844f2847 (commit)
      from  636a93454db40fa56e0927403fd34795aa268baf (commit)


- Log -----------------------------------------------------------------
commit f16f363a85baa6338744e20671c5a227844f2847
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Feb 19 15:57:01 2021 +0000

    Fix no-tests on mingw
    
    Using the no-tests option on mingw in an out-of-source build tree was
    failing.
    
    Fixes #14246
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14249)

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index b2abee23e6..16d4337dab 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1561,12 +1561,16 @@ EOF
       if (windowsdll()) {
           $recipe .= <<"EOF";
 	rm -f apps/$full
-	rm -f test/$full
 	rm -f fuzz/$full
 	cp -p $full apps/
-	cp -p $full test/
 	cp -p $full fuzz/
 EOF
+          if (!$disabled{tests}) {
+            $recipe .= <<"EOF";
+	rm -f test/$full
+	cp -p $full test/
+EOF
+          }
       }
       $recipe .= <<"EOF" if defined $argfile;
 $argfile: $argfiledeps


More information about the openssl-commits mailing list