[openssl-commits] [openssl] master update
Emilia Kasper
emilia at openssl.org
Fri Nov 4 14:06:14 UTC 2016
The branch master has been updated
via 308b876da9eff2f6455a32751b7ffeeaf6ee3fb8 (commit)
via 6ec327eed616deeb4e5ecf1abfb1e1a530ba0701 (commit)
from 7b1954384114643e1a3c3a0ababa3fd7a112c5e3 (commit)
- Log -----------------------------------------------------------------
commit 308b876da9eff2f6455a32751b7ffeeaf6ee3fb8
Author: Emilia Kasper <emilia at openssl.org>
Date: Thu Nov 3 17:15:41 2016 +0100
Don't create fixtures for simple tests
The test fixtures are (meant to be) useful for sharing common
setup. Don't bother when we don't have any setup/teardown.
This only addresses simple tests. Parameterized tests (ADD_ALL_TESTS)
will be made more user-friendly in a follow-up.
Reviewed-by: Rich Salz <rsalz at openssl.org>
commit 6ec327eed616deeb4e5ecf1abfb1e1a530ba0701
Author: Emilia Kasper <emilia at openssl.org>
Date: Thu Nov 3 14:27:05 2016 +0100
testutil: always print errors on failure
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
test/asn1_internal_test.c | 75 +++++++------------------------------------
test/cipherlist_test.c | 1 -
test/ct_test.c | 1 -
test/d2i_test.c | 30 +----------------
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 | 20 ++++++++++--
test/testutil.h | 15 +++++----
test/x509_internal_test.c | 44 ++-----------------------
13 files changed, 40 insertions(+), 155 deletions(-)
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index fc0ac20..6a5fce4 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -18,27 +18,15 @@
#include "testutil.h"
#include "e_os.h"
-typedef struct {
- const char *test_case_name;
- const char *test_section;
-} SIMPLE_FIXTURE;
-
/**********************************************************************
*
* Test of a_strnid's tbl_standard
*
***/
-static SIMPLE_FIXTURE setup_tbl_standard(const char *const test_case_name)
-{
- SIMPLE_FIXTURE fixture;
- fixture.test_case_name = test_case_name;
- return fixture;
-}
-
#include "../crypto/asn1/tbl_standard.h"
-static int execute_tbl_standard(SIMPLE_FIXTURE fixture)
+static int test_tbl_standard()
{
const ASN1_STRING_TABLE *tmp;
int last_nid = -1;
@@ -53,39 +41,27 @@ static int execute_tbl_standard(SIMPLE_FIXTURE fixture)
}
if (last_nid != 0) {
- fprintf(stderr, "%s: Table order OK\n", fixture.test_section);
+ fprintf(stderr, "asn1 tbl_standard: Table order OK\n");
return 1;
}
for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++)
- fprintf(stderr, "%s: Index %" OSSLzu ", NID %d, Name=%s\n",
- fixture.test_section, i, tmp->nid, OBJ_nid2ln(tmp->nid));
+ fprintf(stderr, "asn1 tbl_standard: Index %" OSSLzu ", NID %d, Name=%s\n",
+ i, tmp->nid, OBJ_nid2ln(tmp->nid));
return 0;
}
-static void teardown_tbl_standard(SIMPLE_FIXTURE fixture)
-{
- ERR_print_errors_fp(stderr);
-}
-
/**********************************************************************
*
* Test of ameth_lib's standard_methods
*
***/
-static SIMPLE_FIXTURE setup_standard_methods(const char *const test_case_name)
-{
- SIMPLE_FIXTURE fixture;
- fixture.test_case_name = test_case_name;
- return fixture;
-}
-
#include "internal/asn1_int.h"
#include "../crypto/asn1/standard_methods.h"
-static int execute_standard_methods(SIMPLE_FIXTURE fixture)
+static int test_standard_methods()
{
const EVP_PKEY_ASN1_METHOD **tmp;
int last_pkey_id = -1;
@@ -101,52 +77,23 @@ static int execute_standard_methods(SIMPLE_FIXTURE fixture)
}
if (last_pkey_id != 0) {
- fprintf(stderr, "%s: Table order OK\n", fixture.test_section);
+ fprintf(stderr, "asn1 standard methods: Table order OK\n");
return 1;
}
for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
i++, tmp++)
- fprintf(stderr, "%s: Index %" OSSLzu ", pkey ID %d, Name=%s\n",
- fixture.test_section, i, (*tmp)->pkey_id,
- OBJ_nid2sn((*tmp)->pkey_id));
+ fprintf(stderr, "asn1 standard methods: Index %" OSSLzu
+ ", pkey ID %d, Name=%s\n", i, (*tmp)->pkey_id,
+ OBJ_nid2sn((*tmp)->pkey_id));
return 0;
}
-static void teardown_standard_methods(SIMPLE_FIXTURE fixture)
-{
- ERR_print_errors_fp(stderr);
-}
-
-/**********************************************************************
- *
- * Test driver
- *
- ***/
-
-static struct {
- const char *section;
- SIMPLE_FIXTURE (*setup)(const char *const test_case_name);
- int (*execute)(SIMPLE_FIXTURE);
- void (*teardown)(SIMPLE_FIXTURE);
-} tests[] = {
- {"asn1 tlb_standard", setup_tbl_standard, execute_tbl_standard,
- teardown_tbl_standard},
- {"asn1 standard_methods", setup_standard_methods, execute_standard_methods,
- teardown_standard_methods}
-};
-
-static int drive_tests(int idx)
-{
- SETUP_TEST_FIXTURE(SIMPLE_FIXTURE, tests[idx].setup);
- fixture.test_section = tests[idx].section;
- EXECUTE_TEST(tests[idx].execute, tests[idx].teardown);
-}
-
int main(int argc, char **argv)
{
- ADD_ALL_TESTS(drive_tests, OSSL_NELEM(tests));
+ ADD_TEST(test_tbl_standard);
+ ADD_TEST(test_standard_methods);
return run_tests(argv[0]);
}
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index 70ebd83..b5dd7d9 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 705fbfb..db03f86 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 9c6fcb6..e12f249 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -41,18 +41,7 @@ typedef struct {
static expected_error_t expected_error = ASN1_UNKNOWN;
-typedef struct d2i_test_fixture {
- const char *test_case_name;
-} D2I_TEST_FIXTURE;
-
-static D2I_TEST_FIXTURE set_up(const char *const test_case_name)
-{
- D2I_TEST_FIXTURE fixture;
- fixture.test_case_name = test_case_name;
- return fixture;
-}
-
-static int execute_test(D2I_TEST_FIXTURE fixture)
+static int test_bad_asn1()
{
BIO *bio = NULL;
ASN1_VALUE *value = NULL;
@@ -116,23 +105,6 @@ static int execute_test(D2I_TEST_FIXTURE fixture)
return ret;
}
-static void tear_down(D2I_TEST_FIXTURE fixture)
-{
- ERR_print_errors_fp(stderr);
-}
-
-#define SETUP_D2I_TEST_FIXTURE() \
- SETUP_TEST_FIXTURE(D2I_TEST_FIXTURE, set_up)
-
-#define EXECUTE_D2I_TEST() \
- EXECUTE_TEST(execute_test, tear_down)
-
-static int test_bad_asn1()
-{
- SETUP_D2I_TEST_FIXTURE();
- EXECUTE_D2I_TEST();
-}
-
/*
* Usage: d2i_test <type> <file>, e.g.
* d2i_test generalname bad_generalname.der
diff --git a/test/heartbeat_test.c b/test/heartbeat_test.c
index 906736c..9f6c6e5 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 7f6a95c..3ed52de 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 a1ed8c7..1e4f6e3 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 e5e7457..05ef878 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 9f14618..fb6214e 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 0f321c6..c601e90 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 a16ef0f..f1cad64 100644
--- a/test/testutil.c
+++ b/test/testutil.c
@@ -15,6 +15,8 @@
#include <string.h>
#include "e_os.h"
+#include <openssl/err.h>
+
/*
* 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,24 @@ 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/testutil.h b/test/testutil.h
index 68d202a..af7c48c 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -12,7 +12,15 @@
#include <openssl/err.h>
+/*
+ * In main(), call ADD_TEST to register each test case function, then call
+ * run_tests() to execute all tests and report the results. The result
+ * returned from run_tests() should be used as the return value for main().
+ */
+# define ADD_TEST(test_function) add_test(#test_function, test_function)
+
/*-
+ * Test cases that share common setup should use the helper
* SETUP_TEST_FIXTURE and EXECUTE_TEST macros for test case functions.
*
* SETUP_TEST_FIXTURE will call set_up() to create a new TEST_FIXTURE_TYPE
@@ -69,13 +77,6 @@
# endif /* __STDC_VERSION__ */
/*
- * In main(), call ADD_TEST to register each test case function, then call
- * run_tests() to execute all tests and report the results. The result
- * returned from run_tests() should be used as the return value for main().
- */
-# define ADD_TEST(test_function) add_test(#test_function, test_function)
-
-/*
* Simple parameterized tests. Adds a test_function(idx) test for each
* 0 <= idx < num.
*/
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 76cc2ed..e0cb615 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -17,28 +17,16 @@
#include "testutil.h"
#include "e_os.h"
-typedef struct {
- const char *test_case_name;
- const char *test_section;
-} SIMPLE_FIXTURE;
-
/**********************************************************************
*
* Test of x509v3
*
***/
-static SIMPLE_FIXTURE setup_standard_exts(const char *const test_case_name)
-{
- SIMPLE_FIXTURE fixture;
- fixture.test_case_name = test_case_name;
- return fixture;
-}
-
#include "../crypto/x509v3/ext_dat.h"
#include "../crypto/x509v3/standard_exts.h"
-static int execute_standard_exts(SIMPLE_FIXTURE fixture)
+static int test_standard_exts()
{
size_t i;
int prev = -1, good = 1;
@@ -64,37 +52,9 @@ static int execute_standard_exts(SIMPLE_FIXTURE fixture)
return good;
}
-static void teardown_standard_exts(SIMPLE_FIXTURE fixture)
-{
- ERR_print_errors_fp(stderr);
-}
-
-/**********************************************************************
- *
- * Test driver
- *
- ***/
-
-static struct {
- const char *section;
- SIMPLE_FIXTURE (*setup)(const char *const test_case_name);
- int (*execute)(SIMPLE_FIXTURE);
- void (*teardown)(SIMPLE_FIXTURE);
-} tests[] = {
- {"standard_exts", setup_standard_exts, execute_standard_exts,
- teardown_standard_exts},
-};
-
-static int drive_tests(int idx)
-{
- SETUP_TEST_FIXTURE(SIMPLE_FIXTURE, tests[idx].setup);
- fixture.test_section = tests[idx].section;
- EXECUTE_TEST(tests[idx].execute, tests[idx].teardown);
-}
-
int main(int argc, char **argv)
{
- ADD_ALL_TESTS(drive_tests, OSSL_NELEM(tests));
+ ADD_TEST(test_standard_exts);
return run_tests(argv[0]);
}
More information about the openssl-commits
mailing list