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

[oweals/openssl.git] / test / ssl_test.c

diff --git a/test/ssl_test.c b/test/ssl_test.c
index e5f0f3068d3df3cfcfb7c65c4ab0cbeb67dc77ad..44232dbdf47ce79041ccb4cd2d9f6b9d3fd462d9 100644 (file)
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -428,23 +428,22 @@ err:
     return ret;
 }
 
-int test_main(int argc, char **argv)
+int setup_tests(void)
 {
-    int result = EXIT_FAILURE;
     long num_tests;
 
-    if (!TEST_int_eq(argc, 2)
-            || !TEST_ptr(conf = NCONF_new(NULL))
+    if (!TEST_ptr(conf = NCONF_new(NULL))
             /* argv[1] should point to the test conf file */
-            || !TEST_int_gt(NCONF_load(conf, argv[1], NULL), 0)
+            || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0)
             || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests",
                                                &num_tests), 0))
-        goto err;
+        return 0;
 
-    ADD_ALL_TESTS(test_handshake, (int)(num_tests));
-    result = run_tests(argv[0]);
+    ADD_ALL_TESTS(test_handshake, (int)num_tests);
+    return 1;
+}
 
-err:
+void cleanup_tests(void)
+{
     NCONF_free(conf);
-    return result;
 }