summaryrefslogtreecommitdiffstats
path: root/test/rc4test.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/rc4test.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/rc4test.c')
-rw-r--r--test/rc4test.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/rc4test.c b/test/rc4test.c
index bf2ec310bb..b2032fdd34 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -116,7 +116,7 @@ static int test_rc_bulk(void)
}
#endif
-void register_tests(void)
+int setup_tests(void)
{
#ifndef OPENSSL_NO_RC4
ADD_ALL_TESTS(test_rc4_encrypt, OSSL_NELEM(data_len));
@@ -124,4 +124,5 @@ void register_tests(void)
ADD_ALL_TESTS(test_rc4_multi_call, data_len[3]);
ADD_TEST(test_rc_bulk);
#endif
+ return 1;
}