From ad887416f1e59c3294a7d8f83a0ca77120523b4a Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 18 Jul 2017 11:48:27 +1000 Subject: Update the test framework so that the need for test_main is removed. Everything that needed test_main now works using the same infrastructure as tests that used register_tests. This meant: * renaming register_tests to setup_tests and giving it a success/failure return. * renaming the init_test function to setup_test_framework. * renaming the finish_test function to pulldown_test_framework. * adding a user provided global_init function that runs before the test frame work is initialised. It returns a failure indication that stops the stest. * adding helper functions that permit tests to access their command line args. * spliting the BIO initialisation and finalisation out from the test setup and teardown. * hiding some of the now test internal functions. * fix the comments in testutil.h Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3953) --- test/modes_internal_test.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'test/modes_internal_test.c') diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c index b3a2b102a4..ea463abae5 100644 --- a/test/modes_internal_test.c +++ b/test/modes_internal_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -949,33 +949,22 @@ static void benchmark_gcm128(const unsigned char *K, size_t Klen, #endif } -int test_main(int argc, char **argv) +int setup_tests(void) { - int result = 0; - int iter_argv; - int benchmark = 0; - - for (iter_argv = 1; iter_argv < argc; iter_argv++) { - if (strcmp(argv[iter_argv], "-b") == 0) - benchmark = 1; - else if (strcmp(argv[iter_argv], "-h") == 0) - goto help; + if (test_has_option("-h")) { + printf("-h\tThis help\n"); + printf("-b\tBenchmark gcm128 in addition to the tests\n"); + return 1; } ADD_ALL_TESTS(test_cts128, OSSL_NELEM(cts128_vectors)); ADD_ALL_TESTS(test_cts128_nist, OSSL_NELEM(cts128_vectors)); ADD_ALL_TESTS(test_gcm128, OSSL_NELEM(gcm128_vectors)); + return 1; +} - result = run_tests(argv[0]); - - if (benchmark) +void cleanup_tests(void) +{ + if (test_has_option("-b")) benchmark_gcm128(K1, sizeof(K1), IV1, sizeof(IV1)); - - return result; - - help: - printf("-h\tThis help\n"); - printf("-b\tBenchmark gcm128 in addition to the tests\n"); - - return 0; } -- cgit v1.2.1