From: Peter Mosmans <support@go-forward.net>
Date: Tue, 27 May 2014 22:26:11 +0000 (+0100)
Subject: RT3346: Fix test_bn regexp for Windows using MSYS.
X-Git-Tag: OpenSSL_1_0_2e~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bf9d61d1abfc4d36562aa799cd9dc59c7bb46e57;p=oweals%2Fopenssl.git

RT3346: Fix test_bn regexp for Windows using MSYS.

(cherry picked from commit 028bac0670c167f154438742eb4d0fbed73df209)

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/test/Makefile b/test/Makefile
index 80aeccf9d9..8cbb5ad17d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -245,7 +245,7 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
 	@../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
 	@echo quit >>tmp.bntest
 	@echo "running bc"
-	@<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
+	@<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0\r?$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
 	@echo 'test a^b%c implementations'
 	../util/shlib_wrap.sh ./$(EXPTEST)