From faeb05507ff481a26bd58ec6a000224796fd5405 Mon Sep 17 00:00:00 2001
From: bluhm <>
Date: Thu, 5 Sep 2019 00:59:36 +0000
Subject: Feed the bntest output to bc(1).  This checks the result of the big
 num calculations and avoids lots of ugly output to stdout.  Remove fflush(3)
 of stderr, it is unbuffered anyway. with Moritz Buhl

---
 src/regress/lib/libcrypto/bn/general/Makefile | 22 +++++++++++++++-------
 src/regress/lib/libcrypto/bn/general/bntest.c |  7 +------
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/regress/lib/libcrypto/bn/general/Makefile b/src/regress/lib/libcrypto/bn/general/Makefile
index d1a73a3769..ca3dcf9b08 100644
--- a/src/regress/lib/libcrypto/bn/general/Makefile
+++ b/src/regress/lib/libcrypto/bn/general/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2019/04/13 22:06:31 tb Exp $
+#	$OpenBSD: Makefile,v 1.6 2019/09/05 00:59:36 bluhm Exp $
 
 .include "../../Makefile.inc"
 
@@ -9,14 +9,22 @@ LDADD =		${CRYPTO_INT}
 DPADD =		${LIBCRYPTO}
 WARNINGS =	Yes
 CFLAGS +=	-Werror
+CLEANFILES =	bntest.out bc.out
 
-.for p in ${PROGS}
-REGRESS_TARGETS += run-$p
+REGRESS_TARGETS += run-bntest
+run-bntest bntest.out: bntest
+	@echo '\n======== $@ ========'
+	./bntest -out bntest.out
 
-run-$p: $p
-	./$p
+REGRESS_TARGETS += run-bc
+run-bc: bntest.out
+	@echo '\n======== $@ ========'
+	bc < bntest.out | tee bc.out | grep -v '^0$$'
+	! grep -v '^test ' <bc.out | grep -v '^0$$'
 
-.PHONY: run-$p
-.endfor
+REGRESS_TARGETS += run-bn_to_string
+run-bn_to_string: bn_to_string
+	@echo '\n======== $@ ========'
+	./bn_to_string
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/general/bntest.c b/src/regress/lib/libcrypto/bn/general/bntest.c
index cff776068b..138b7673e6 100644
--- a/src/regress/lib/libcrypto/bn/general/bntest.c
+++ b/src/regress/lib/libcrypto/bn/general/bntest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bntest.c,v 1.20 2018/07/17 17:06:49 tb Exp $	*/
+/*	$OpenBSD: bntest.c,v 1.21 2019/09/05 00:59:36 bluhm Exp $	*/
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2028,7 +2028,6 @@ genprime_cb(int p, int n, BN_GENCB *arg)
 	if (p == 3)
 		c = '\n';
 	putc(c, stderr);
-	fflush(stderr);
 	return (1);
 }
 
@@ -2116,11 +2115,9 @@ test_kron(BIO *bp, BN_CTX *ctx)
 		}
 
 		putc('.', stderr);
-		fflush(stderr);
 	}
 
 	putc('\n', stderr);
-	fflush(stderr);
 	rc = 1;
 err:
 	BN_free(a);
@@ -2207,11 +2204,9 @@ test_sqrt(BIO *bp, BN_CTX *ctx)
 			}
 
 			putc('.', stderr);
-			fflush(stderr);
 		}
 
 		putc('\n', stderr);
-		fflush(stderr);
 	}
 	rc = 1;
 err:
-- 
cgit v1.2.3-55-g6feb