diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-28 09:49:46 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-01 07:10:48 +0100 |
| commit | 71bb86f0dc72c49d9efc098a71a6654004a2035a (patch) | |
| tree | 49c531123f5e7a05775a008390c987478a05389a /apps/apps.h | |
| parent | 39556e63ef6c079d144b07d7f492152abf9efe77 (diff) | |
Make sure that apps/openssl prefixes its output with '# ' during tests
The reason to do this is that some output might start with an 'ok',
which TAP catches and takes for TAP output. The TAP compatible way is
to make all output it shouldn't catch look like comments.
We do this by setting the environment variable HARNESS_OSSL_PREFIX
during tests. When that is set, apps/openssl uses BIO_f_linebuffer
and sets its prefix to the content of that environment variable.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5224)
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/apps.h b/apps/apps.h index 272b967d18..daaef369bc 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -55,6 +55,12 @@ BIO_METHOD *apps_bf_prefix(void); * remains unlikely for the foreseeable future and beyond. */ #define PREFIX_CTRL_SET_PREFIX (1 << 15) +/* + * apps_bf_prefix() returns a dynamically created BIO_METHOD, which we + * need to destroy at some point. When created internally, it's stored + * in an internal pointer which can be freed with the following function + */ +void destroy_prefix_method(void); BIO *dup_bio_in(int format); BIO *dup_bio_out(int format); |