summaryrefslogtreecommitdiffstats
path: root/test/cipherbytes_test.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-07-18 11:48:27 +1000
committerPauli <paul.dale@oracle.com>2017-07-27 07:53:08 +1000
commitad887416f1e59c3294a7d8f83a0ca77120523b4a (patch)
tree99971c4acaaa7a43efa38a0d52e230c0e68a1c6c /test/cipherbytes_test.c
parentd445302418b41b76c15e103954b1311d98077480 (diff)
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 <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3953)
Diffstat (limited to 'test/cipherbytes_test.c')
-rw-r--r--test/cipherbytes_test.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c
index bc3051ed34..6601f7b5d6 100644
--- a/test/cipherbytes_test.c
+++ b/test/cipherbytes_test.c
@@ -129,22 +129,21 @@ err:
return ret;
}
-int test_main(int argc, char **argv)
+int setup_tests(void)
{
- int ret;
-
if (!TEST_ptr(ctx = SSL_CTX_new(TLS_server_method()))
|| !TEST_ptr(s = SSL_new(ctx)))
- return EXIT_FAILURE;
+ return 0;
ADD_TEST(test_empty);
ADD_TEST(test_unsupported);
ADD_TEST(test_v2);
ADD_TEST(test_v3);
- ret = run_tests(argv[0]);
+ return 1;
+}
+void cleanup_tests(void)
+{
SSL_free(s);
SSL_CTX_free(ctx);
-
- return ret;
}