mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-12 20:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

testutil: Remove test_puts_std{out,err}, they are superfluous

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3345)
This commit is contained in:
Richard Levitte 2017-04-28 15:40:55 +02:00
parent 68e49bf223
commit 0918b94c9c
5 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/bioprinttest.c
View File

@ -261,18 +261,6 @@ void test_close_streams(void)
{
}
int test_puts_stdout(const char *str)
{
return fputs(str, stdout);
}
int test_puts_stderr(const char *str)
{
return fputs(str, stderr);
}
static char vprint_buf[10240];
/*
* This works out as long as caller doesn't use any "fancy" formats.
* But we are caller's caller, and test_str_eq is the only one called,
@ -280,20 +268,12 @@ static char vprint_buf[10240];
*/
int test_vprintf_stdout(const char *fmt, va_list ap)
{
size_t len = vsnprintf(vprint_buf, sizeof(vprint_buf), fmt, ap);
if (len >= sizeof(vprint_buf))
return -1;
return test_puts_stdout(vprint_buf);
return vfprintf(stdout, fmt, ap);
}
int test_vprintf_stderr(const char *fmt, va_list ap)
{
size_t len = vsnprintf(vprint_buf, sizeof(vprint_buf), fmt, ap);
if (len >= sizeof(vprint_buf))
return -1;
return test_puts_stderr(vprint_buf);
return vfprintf(stderr, fmt, ap);
}
int test_flush_stdout(void)

10
test/testutil/basic_output.c
View File

@ -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);

2
test/testutil/output.h
View File

@ -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 */

2
test/testutil/test_main.c
View File

@ -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]);

10
test/testutil/tests.c
View File

@ -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();
}