[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  30bb02597df9a79b46bae2ddc9885a35286ed205 (commit)
      from  61389f0981b4e30247f2cb9828e4a0e0fc55f7a6 (commit)


- Log -----------------------------------------------------------------
commit 30bb02597df9a79b46bae2ddc9885a35286ed205
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 16 14:33:13 2017 +0100

    Copy dlls into fuzz directory
    
    This should fix the recent AppVeyor failures.
    
    [extended tests]
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4171)

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 8503e44..c13dbdf 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -238,6 +238,7 @@ libclean:
 	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
 	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """apps/$$1.*"""; } @ARGV" $(SHLIBS)
 	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """test/$$1.*"""; } @ARGV" $(SHLIBS)
+	"$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """fuzz/$$1.*"""; } @ARGV" $(SHLIBS)
 	-del /Q /F $(LIBS)
 	-del /Q ossl_static.pdb
 
@@ -520,8 +521,10 @@ $objs $shlib.res$linklibs \$(EX_LIBS)
 	   \$(MT) \$(MTFLAGS) \$(MTINFLAG)$shlib$shlibext.manifest \$(MTOUTFLAG)$shlib$shlibext
 	IF EXIST apps\\$shlib$shlibext DEL /Q /F apps\\$shlib$shlibext
 	IF EXIST test\\$shlib$shlibext DEL /Q /F test\\$shlib$shlibext
+	IF EXIST fuzz\\$shlib$shlibext DEL /Q /F fuzz\\$shlib$shlibext
 	COPY $shlib$shlibext apps
 	COPY $shlib$shlibext test
+	COPY $shlib$shlibext fuzz
 EOF
  }
  sub obj2dso {