From: Shane Lontis <shane.lontis@oracle.com>
Date: Mon, 17 Aug 2020 02:34:17 +0000 (+1000)
Subject: Fix broken windows builds.
X-Git-Tag: openssl-3.0.0-alpha7~566
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c4e2e52d87d61a6df3ddf5f67c7207387585d6c;p=thirdparty%2Fopenssl.git

Fix broken windows builds.

A miscellaneous '\' was accidently added to set FIPSKEY=$(FIPSKEY) which was causing some
external CI build loops to not produce test results.
It looks like it was accidently copied from the unix variant which requires the '\'.
Thanks to Wolfgang Beck for tracking down the issue.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12661)
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index c2507a6508f..dfabda7eef3 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -406,7 +406,7 @@ test: tests
 	set SRCTOP=$(SRCDIR)
 	set BLDTOP=$(BLDDIR)
 	set PERL=$(PERL)
-	set FIPSKEY=$(FIPSKEY) \
+	set FIPSKEY=$(FIPSKEY)
 	"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
 	@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
 	@$(ECHO) "Tests are not supported with your chosen Configure options"