From 8dce4aa2d974fa357bb3f7d8a77e581d487de732 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 5 Jun 2020 16:55:42 +0200 Subject: TESTUTIL: Separate TAP output and other output by BIO filter Output that's supposed to be understood by a TAP parser gets its own BIOs (|tap_out| and |tap_err|), and is only used internally within testutils. |bio_out| and |bio_err| is now only used for output that shouldn't be parsed by the TAP parser, and all output written to those BIOs are therefore always made to look like comments (it gets prefixed with "# "). Indentation and prefixing with "# " is reworked to use BIO_f_prefix(), which allows us to throw away the internal BIO_f_tap(). The indentation level is now adjusted via a special function. Fixes #12054 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12057) --- test/build.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/build.info') diff --git a/test/build.info b/test/build.info index 868b8ebefa..6256a34c91 100644 --- a/test/build.info +++ b/test/build.info @@ -20,7 +20,7 @@ IF[{- !$disabled{tests} -}] LIBS{noinst,has_main}=libtestutil.a SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \ testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \ - testutil/format_output.c testutil/tap_bio.c \ + testutil/format_output.c \ testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \ testutil/options.c testutil/test_options.c \ testutil/apps_mem.c testutil/random.c $LIBAPPSSRC -- cgit v1.2.3