Update the test framework so that the need for test_main is removed. Everything

[openssl.git] / test / enginetest.c

diff --git a/test/enginetest.c b/test/enginetest.c
index 9b00c0122685e7f9c3cba65671b90093c79dec46..d32260f5ca4b377cdf369bb6007d3fa2bfa3d955 100644 (file)
--- 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;
+}