diff options
author | Richard Levitte <levitte@openssl.org> | 2017-04-28 15:40:55 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-04-28 15:59:46 +0200 |
commit | 0918b94c9c01307a1cc4cfc347d458827e30ffea (patch) | |
tree | ca2db045ffbfa71b877b2e2ad6086c6f54123258 /test/testutil | |
parent | 68e49bf22384c33494886eb95d78f1f69f433781 (diff) | |
download | openssl-0918b94c9c01307a1cc4cfc347d458827e30ffea.tar.gz |
testutil: Remove test_puts_std{out,err}, they are superfluous
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3345)
Diffstat (limited to 'test/testutil')
-rw-r--r-- | test/testutil/basic_output.c | 10 | ||||
-rw-r--r-- | test/testutil/output.h | 2 | ||||
-rw-r--r-- | test/testutil/test_main.c | 2 | ||||
-rw-r--r-- | test/testutil/tests.c | 10 |
4 files changed, 5 insertions, 19 deletions
diff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c index 8cf5def714..6e1f99a5ad 100644 --- a/test/testutil/basic_output.c +++ b/test/testutil/basic_output.c @@ -31,16 +31,6 @@ void test_close_streams(void) BIO_free(bio_err); } -int test_puts_stdout(const char *str) -{ - return BIO_puts(bio_out, str); -} - -int test_puts_stderr(const char *str) -{ - return BIO_puts(bio_err, str); -} - int test_vprintf_stdout(const char *fmt, va_list ap) { return BIO_vprintf(bio_out, fmt, ap); diff --git a/test/testutil/output.h b/test/testutil/output.h index 1ca12d289f..7c03affcc8 100644 --- a/test/testutil/output.h +++ b/test/testutil/output.h @@ -19,8 +19,6 @@ void test_open_streams(void); void test_close_streams(void); /* The following ALL return the number of characters written */ -int test_puts_stdout(const char *str); -int test_puts_stderr(const char *str); int test_vprintf_stdout(const char *fmt, va_list ap); int test_vprintf_stderr(const char *fmt, va_list ap); /* These return failure or success */ diff --git a/test/testutil/test_main.c b/test/testutil/test_main.c index 7c9843c01c..3fa08b6402 100644 --- a/test/testutil/test_main.c +++ b/test/testutil/test_main.c @@ -15,7 +15,7 @@ int test_main(int argc, char *argv[]) { if (argc > 1) - test_puts_stderr("Warning: ignoring extra command-line arguments.\n"); + test_printf_stderr("Warning: ignoring extra command-line arguments.\n"); register_tests(); return run_tests(argv[0]); diff --git a/test/testutil/tests.c b/test/testutil/tests.c index 0efaa064b6..19a366f34c 100644 --- a/test/testutil/tests.c +++ b/test/testutil/tests.c @@ -49,19 +49,17 @@ static void test_fail_message(const char *prefix, const char *file, int line, static void test_fail_message_va(const char *prefix, const char *file, int line, const char *type, const char *fmt, va_list ap) { - test_printf_stderr("%*s# ", subtest_level(), ""); - test_puts_stderr(prefix != NULL ? prefix : "ERROR"); - test_puts_stderr(":"); + test_printf_stderr("%*s# %s: ", subtest_level(), "", + prefix != NULL ? prefix : "ERROR"); if (type) - test_printf_stderr(" (%s)", type); + test_printf_stderr("(%s)", type); if (fmt != NULL) { - test_puts_stderr(" "); test_vprintf_stderr(fmt, ap); } if (file != NULL) { test_printf_stderr(" @ %s:%d", file, line); } - test_puts_stderr("\n"); + test_printf_stderr("\n"); test_flush_stderr(); } |