summaryrefslogtreecommitdiffstats
path: root/test/enginetest.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/enginetest.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/enginetest.c')
-rw-r--r--test/enginetest.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/test/enginetest.c b/test/enginetest.c
index 9b00c01226..d32260f5ca 100644
--- a/test/enginetest.c
+++ b/test/enginetest.c
@@ -12,13 +12,7 @@
#include <stdlib.h>
#include <openssl/e_os2.h>
-#ifdef OPENSSL_NO_ENGINE
-int main(int argc, char *argv[])
-{
- printf("No ENGINE support\n");
- return EXIT_SUCCESS;
-}
-#else
+#ifndef OPENSSL_NO_ENGINE
# include <openssl/buffer.h>
# include <openssl/crypto.h>
# include <openssl/engine.h>
@@ -180,9 +174,14 @@ static int test_engines(void)
ENGINE_free(block[loop]);
return to_return;
}
+#endif
-void register_tests(void)
+int setup_tests(void)
{
+#ifdef OPENSSL_NO_ENGINE
+ TEST_note("No ENGINE support");
+#else
ADD_TEST(test_engines);
-}
#endif
+ return 1;
+}