From: Richard Levitte <levitte@openssl.org>
Date: Fri, 5 Jun 2020 15:05:07 +0000 (+0200)
Subject: TEST: Adjust test/bioprinttest.c to behave like the testutil routines
X-Git-Tag: openssl-3.0.0-alpha4~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4683009ad6e8d64e80112fd689921f6c169bd20;p=thirdparty%2Fopenssl.git

TEST: Adjust test/bioprinttest.c to behave like the testutil routines

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12057)
---

diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index 18c00e09b66..04d1613c6cf 100644
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -297,10 +297,20 @@ int setup_tests(void)
  * Replace testutil output routines.  We do this to eliminate possible sources
  * of BIO error
  */
+BIO *bio_out = NULL;
+BIO *bio_err = NULL;
+
+static int tap_level = 0;
+
 void test_open_streams(void)
 {
 }
 
+void test_adjust_streams_tap_level(int level)
+{
+    tap_level = level;
+}
+
 void test_close_streams(void)
 {
 }
@@ -312,12 +322,12 @@ void test_close_streams(void)
  */
 int test_vprintf_stdout(const char *fmt, va_list ap)
 {
-    return vfprintf(stdout, fmt, ap);
+    return fprintf(stdout, "%*s# ", tap_level, "") + vfprintf(stdout, fmt, ap);
 }
 
 int test_vprintf_stderr(const char *fmt, va_list ap)
 {
-    return vfprintf(stderr, fmt, ap);
+    return fprintf(stderr, "%*s# ", tap_level, "") + vfprintf(stderr, fmt, ap);
 }
 
 int test_flush_stdout(void)
@@ -330,3 +340,23 @@ int test_flush_stderr(void)
     return fflush(stderr);
 }
 
+int test_vprintf_tapout(const char *fmt, va_list ap)
+{
+    return fprintf(stdout, "%*s", tap_level, "") + vfprintf(stdout, fmt, ap);
+}
+
+int test_vprintf_taperr(const char *fmt, va_list ap)
+{
+    return fprintf(stderr, "%*s", tap_level, "") + vfprintf(stderr, fmt, ap);
+}
+
+int test_flush_tapout(void)
+{
+    return fflush(stdout);
+}
+
+int test_flush_taperr(void)
+{
+    return fflush(stderr);
+}
+