summaryrefslogtreecommitdiffstats
path: root/test/ct_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/ct_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/ct_test.c')
-rw-r--r--test/ct_test.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/ct_test.c b/test/ct_test.c
index 5deb758457..9c46bb4778 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -501,7 +501,7 @@ static int test_ctlog_from_base64(void)
}
#endif
-int test_main(int argc, char *argv[])
+int setup_tests(void)
{
#ifndef OPENSSL_NO_CT
if ((ct_dir = getenv("CT_DIR")) == NULL)
@@ -519,10 +519,8 @@ int test_main(int argc, char *argv[])
ADD_TEST(test_encode_tls_sct);
ADD_TEST(test_default_ct_policy_eval_ctx_time_is_now);
ADD_TEST(test_ctlog_from_base64);
-
- return run_tests(argv[0]);
#else
printf("No CT support\n");
- return EXIT_SUCCESS;
#endif
+ return 1;
}