diff options
Diffstat (limited to 'test/testutil/driver.c')
| -rw-r--r-- | test/testutil/driver.c | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/test/testutil/driver.c b/test/testutil/driver.c index b0bd3e079a..6689a781cd 100644 --- a/test/testutil/driver.c +++ b/test/testutil/driver.c @@ -125,15 +125,6 @@ static void finalize(int success) ERR_print_errors_cb(err_cb, NULL); } -static void helper_printf_stdout(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - test_vprintf_stdout(fmt, ap); - va_end(ap); -} - int run_tests(const char *test_prog_name) { int num_failed = 0; @@ -141,13 +132,13 @@ int run_tests(const char *test_prog_name) int i, j; if (num_tests < 1) - helper_printf_stdout("%*s1..0 # Skipped: %s\n", level, "", - test_prog_name); + test_printf_stdout("%*s1..0 # Skipped: %s\n", level, "", + test_prog_name); else if (level > 0) - helper_printf_stdout("%*s1..%d # Subtest: %s\n", level, "", num_tests, - test_prog_name); + test_printf_stdout("%*s1..%d # Subtest: %s\n", level, "", num_tests, + test_prog_name); else - helper_printf_stdout("%*s1..%d\n", level, "", num_tests); + test_printf_stdout("%*s1..%d\n", level, "", num_tests); test_flush_stdout(); for (i = 0; i != num_tests; ++i) { @@ -162,8 +153,8 @@ int run_tests(const char *test_prog_name) verdict = "not ok"; ++num_failed; } - helper_printf_stdout("%*s%s %d - %s\n", level, "", verdict, i + 1, - all_tests[i].test_case_name); + test_printf_stdout("%*s%s %d - %s\n", level, "", verdict, i + 1, + all_tests[i].test_case_name); test_flush_stdout(); finalize(ret); } else { @@ -171,10 +162,10 @@ int run_tests(const char *test_prog_name) level += 4; if (all_tests[i].subtest) { - helper_printf_stdout("%*s# Subtest: %s\n", level, "", - all_tests[i].test_case_name); - helper_printf_stdout("%*s%d..%d\n", level, "", 1, - all_tests[i].num); + test_printf_stdout("%*s# Subtest: %s\n", level, "", + all_tests[i].test_case_name); + test_printf_stdout("%*s%d..%d\n", level, "", 1, + all_tests[i].num); test_flush_stdout(); } @@ -195,7 +186,7 @@ int run_tests(const char *test_prog_name) verdict = "not ok"; ++num_failed_inner; } - helper_printf_stdout("%*s%s %d\n", level, "", verdict, j + 1); + test_printf_stdout("%*s%s %d\n", level, "", verdict, j + 1); test_flush_stdout(); } } @@ -206,8 +197,8 @@ int run_tests(const char *test_prog_name) verdict = "not ok"; ++num_failed; } - helper_printf_stdout("%*s%s %d - %s\n", level, "", verdict, i + 1, - all_tests[i].test_case_name); + test_printf_stdout("%*s%s %d - %s\n", level, "", verdict, i + 1, + all_tests[i].test_case_name); test_flush_stdout(); } } |