testutil: always print errors on failure

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index fc0ac202b4154a644c41e3161d12860b6a8c7df7..eed7c580f023ba8dc0acd087483a0703528d03c8 100644 (file)
--- 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)
 {
 
 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)
 {
 
 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 70ebd835660ec017901a23a7327cd918e054d95a..b5dd7d9fa75f469e73ead123aa1fc971ce1948d1 100644 (file)
--- 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);
 {
     SSL_CTX_free(fixture.server);
     SSL_CTX_free(fixture.client);

-    ERR_print_errors_fp(stderr);

 }
 
 #define SETUP_CIPHERLIST_TEST_FIXTURE() \
 }
 
 #define SETUP_CIPHERLIST_TEST_FIXTURE() \

diff --git a/test/ct_test.c b/test/ct_test.c
index 705fbfbb83f77f57d933797b325f0497656b2669..db03f868eeb0ce7c58e5be383f54c1dae89338a9 100644 (file)
--- 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);
 {
     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)
 }
 
 static char *mk_file_path(const char *dir, const char *file)

diff --git a/test/d2i_test.c b/test/d2i_test.c
index 9c6fcb6a72adaea62eb5d7867d0f15d3d05fe8e7..c536764baed7bb47b6b06055325eb6ca62f5c204 100644 (file)
--- 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)
 {
 
 static void tear_down(D2I_TEST_FIXTURE fixture)
 {

-    ERR_print_errors_fp(stderr);

 }
 
 #define SETUP_D2I_TEST_FIXTURE() \
 }
 
 #define SETUP_D2I_TEST_FIXTURE() \

diff --git a/test/heartbeat_test.c b/test/heartbeat_test.c
index 906736c37e560ac22fb013758d2817ed1ea1e658..9f6c6e538ab981f4065879948ce5bc20aef2a0ce 100644 (file)
--- 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)
 {
 
 static void tear_down(HEARTBEAT_TEST_FIXTURE fixture)
 {

-    ERR_print_errors_fp(stderr);

     SSL_free(fixture.s);
     SSL_CTX_free(fixture.ctx);
 }
     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]);
     ADD_TEST(test_dtls1_heartbleed_excessive_plaintext_length);
 
     result = run_tests(argv[0]);

-    ERR_print_errors_fp(stderr);

     return result;
 }
 
     return result;
 }
 

diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c
index 7f6a95cf4aa43d887dcaab58a22d098fe495c4bf..3ed52de5ac630c2e94b46ba41c7d95a5cf2a5e7a 100644 (file)
--- 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)
 {
 
 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 a1ed8c73ea5dadcf8cb17f7edbd1b37066096db1..1e4f6e33675d635ba2b5411a8318bf2d5921f4d2 100644 (file)
--- 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)
 {
 
 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)
 {
 
 static void teardown_gcm128(GCM128_FIXTURE fixture)
 {

-    ERR_print_errors_fp(stderr);

 }
 
 static void benchmark_gcm128(const unsigned char *K, size_t Klen,
 }
 
 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 e5e7457e214012dab47439010864c5bec2af6dcf..05ef878c535c1e2cbe2ea31368592a96591e4100 100644 (file)
--- 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)
 {
 
 static void teardown_poly1305(SIMPLE_FIXTURE fixture)
 {

-    ERR_print_errors_fp(stderr);

 }
 
 static void benchmark_poly1305()
 }
 
 static void benchmark_poly1305()

diff --git a/test/ssl_test.c b/test/ssl_test.c
index 9f146180f31b6bd3d80923ad0b446cb2b0340339..fb6214e9fed14d916bf6e430a6043dd44233d7cd 100644 (file)
--- 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);
     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;
 }
     HANDSHAKE_RESULT_free(result);
     return ret;
 }

diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index 0f321c60f3332910cbeed6adac8f12257a1abd05..c601e903eda21bdf92c2462010b13015f9012216 100644 (file)
--- 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);
 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()                       \
 }
 
 #define SETUP_SSL_TEST_CTX_TEST_FIXTURE()                       \

diff --git a/test/testutil.c b/test/testutil.c
index a16ef0fa0779920a47a93bf13abbc3adb4f1e3f3..c783b4a98a898a249053413ecd78665897235665 100644 (file)
--- a/test/testutil.c
+++ b/test/testutil.c
@@ -15,6 +15,8 @@
 #include <string.h>
 #include "e_os.h"
 
 #include <string.h>
 #include "e_os.h"
 

+#include <openssl/err.h>
+

 /*
  * Declares the structures needed to register each test case function.
  */
 /*
  * 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;
 }
 
     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;
 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) {
 
     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;
             }
                 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++) {
         } 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;
                 }
                     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 76cc2edcfb07e8ab9b714c368b915bc50e02771f..baa4c5a1fdc588032df18c5e7c093035059c4920 100644 (file)
--- 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)
 {
 
 static void teardown_standard_exts(SIMPLE_FIXTURE fixture)
 {

-    ERR_print_errors_fp(stderr);

 }
 
 /**********************************************************************
 }
 
 /**********************************************************************