From 6ec327eed616deeb4e5ecf1abfb1e1a530ba0701 Mon Sep 17 00:00:00 2001 From: Emilia Kasper Date: Thu, 3 Nov 2016 14:27:05 +0100 Subject: testutil: always print errors on failure Reviewed-by: Richard Levitte --- test/asn1_internal_test.c | 2 -- test/cipherlist_test.c | 1 - test/ct_test.c | 1 - test/d2i_test.c | 1 - test/heartbeat_test.c | 2 -- test/mdc2_internal_test.c | 1 - test/modes_internal_test.c | 2 -- test/poly1305_internal_test.c | 1 - test/ssl_test.c | 2 -- test/ssl_test_ctx_test.c | 1 - test/testutil.c | 18 ++++++++++++++++-- test/x509_internal_test.c | 1 - 12 files changed, 16 insertions(+), 17 deletions(-) diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c index fc0ac202b4..eed7c580f0 100644 --- a/test/asn1_internal_test.c +++ b/test/asn1_internal_test.c @@ -66,7 +66,6 @@ static int execute_tbl_standard(SIMPLE_FIXTURE fixture) static void teardown_tbl_standard(SIMPLE_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } /********************************************************************** @@ -116,7 +115,6 @@ static int execute_standard_methods(SIMPLE_FIXTURE fixture) static void teardown_standard_methods(SIMPLE_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } /********************************************************************** diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c index 70ebd83566..b5dd7d9fa7 100644 --- a/test/cipherlist_test.c +++ b/test/cipherlist_test.c @@ -167,7 +167,6 @@ static void tear_down(CIPHERLIST_TEST_FIXTURE fixture) { SSL_CTX_free(fixture.server); SSL_CTX_free(fixture.client); - ERR_print_errors_fp(stderr); } #define SETUP_CIPHERLIST_TEST_FIXTURE() \ diff --git a/test/ct_test.c b/test/ct_test.c index 705fbfbb83..db03f868ee 100644 --- a/test/ct_test.c +++ b/test/ct_test.c @@ -88,7 +88,6 @@ static void tear_down(CT_TEST_FIXTURE fixture) { CTLOG_STORE_free(fixture.ctlog_store); SCT_LIST_free(fixture.sct_list); - ERR_print_errors_fp(stderr); } static char *mk_file_path(const char *dir, const char *file) diff --git a/test/d2i_test.c b/test/d2i_test.c index 9c6fcb6a72..c536764bae 100644 --- a/test/d2i_test.c +++ b/test/d2i_test.c @@ -118,7 +118,6 @@ static int execute_test(D2I_TEST_FIXTURE fixture) static void tear_down(D2I_TEST_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } #define SETUP_D2I_TEST_FIXTURE() \ diff --git a/test/heartbeat_test.c b/test/heartbeat_test.c index 906736c37e..9f6c6e538a 100644 --- a/test/heartbeat_test.c +++ b/test/heartbeat_test.c @@ -155,7 +155,6 @@ static int dummy_handshake(SSL *s) static void tear_down(HEARTBEAT_TEST_FIXTURE fixture) { - ERR_print_errors_fp(stderr); SSL_free(fixture.s); SSL_CTX_free(fixture.ctx); } @@ -365,7 +364,6 @@ int main(int argc, char *argv[]) ADD_TEST(test_dtls1_heartbleed_excessive_plaintext_length); result = run_tests(argv[0]); - ERR_print_errors_fp(stderr); return result; } diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c index 7f6a95cf4a..3ed52de5ac 100644 --- a/test/mdc2_internal_test.c +++ b/test/mdc2_internal_test.c @@ -60,7 +60,6 @@ static int execute_mdc2(SIMPLE_FIXTURE fixture) static void teardown_mdc2(SIMPLE_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } /********************************************************************** diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c index a1ed8c73ea..1e4f6e3367 100644 --- a/test/modes_internal_test.c +++ b/test/modes_internal_test.c @@ -210,7 +210,6 @@ static int execute_cts128_nist(CTS128_FIXTURE fixture) static void teardown_cts128(CTS128_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } /********************************************************************** @@ -279,7 +278,6 @@ static int execute_gcm128(GCM128_FIXTURE fixture) static void teardown_gcm128(GCM128_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } static void benchmark_gcm128(const unsigned char *K, size_t Klen, diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c index e5e7457e21..05ef878c53 100644 --- a/test/poly1305_internal_test.c +++ b/test/poly1305_internal_test.c @@ -144,7 +144,6 @@ static int execute_poly1305(SIMPLE_FIXTURE fixture) static void teardown_poly1305(SIMPLE_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } static void benchmark_poly1305() diff --git a/test/ssl_test.c b/test/ssl_test.c index 9f146180f3..fb6214e9fe 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -301,8 +301,6 @@ err: SSL_CTX_free(resume_server_ctx); SSL_CTX_free(resume_client_ctx); SSL_TEST_CTX_free(test_ctx); - if (ret != 1) - ERR_print_errors_fp(stderr); HANDSHAKE_RESULT_free(result); return ret; } diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c index 0f321c60f3..c601e903ed 100644 --- a/test/ssl_test_ctx_test.c +++ b/test/ssl_test_ctx_test.c @@ -233,7 +233,6 @@ static int execute_failure_test(SSL_TEST_CTX_TEST_FIXTURE fixture) static void tear_down(SSL_TEST_CTX_TEST_FIXTURE fixture) { SSL_TEST_CTX_free(fixture.expected_ctx); - ERR_print_errors_fp(stderr); } #define SETUP_SSL_TEST_CTX_TEST_FIXTURE() \ diff --git a/test/testutil.c b/test/testutil.c index a16ef0fa07..c783b4a98a 100644 --- a/test/testutil.c +++ b/test/testutil.c @@ -15,6 +15,8 @@ #include #include "e_os.h" +#include + /* * Declares the structures needed to register each test case function. */ @@ -55,6 +57,14 @@ void add_all_tests(const char *test_case_name, int(*test_fn)(int idx), num_test_cases += num; } +static void finalize(int success) +{ + if (success) + ERR_clear_error(); + else + ERR_print_errors_fp(stderr); +} + int run_tests(const char *test_prog_name) { int num_failed = 0; @@ -66,18 +76,22 @@ int run_tests(const char *test_prog_name) for (i = 0; i != num_tests; ++i) { if (all_tests[i].num == -1) { - if (!all_tests[i].test_fn()) { + int ret = all_tests[i].test_fn(); + if (!ret) { printf("** %s failed **\n--------\n", all_tests[i].test_case_name); ++num_failed; } + finalize(ret); } else { for (j = 0; j < all_tests[i].num; j++) { - if (!all_tests[i].param_test_fn(j)) { + int ret = all_tests[i].param_test_fn(j); + if (!ret) { printf("** %s failed test %d\n--------\n", all_tests[i].test_case_name, j); ++num_failed; } + finalize(ret); } } } diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c index 76cc2edcfb..baa4c5a1fd 100644 --- a/test/x509_internal_test.c +++ b/test/x509_internal_test.c @@ -66,7 +66,6 @@ static int execute_standard_exts(SIMPLE_FIXTURE fixture) static void teardown_standard_exts(SIMPLE_FIXTURE fixture) { - ERR_print_errors_fp(stderr); } /********************************************************************** -- cgit v1.2.3