Remove EXECUTE_TEST_NO_TEARDOWN.

[openssl.git] / test / ct_test.c

diff --git a/test/ct_test.c b/test/ct_test.c
index b44a41cbdf523e44bd3b512a1d28df89021e90d2..9c46bb4778d543375db16d317f992b71c0a546bf 100644 (file)
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -488,20 +488,20 @@ end:
 
 static int test_ctlog_from_base64(void)
 {
-    CTLOG *log = NULL;
+    CTLOG *ctlogp = NULL;
     const char notb64[] = "\01\02\03\04";
     const char pad[] = "====";
     const char name[] = "name";
 
     /* We expect these to both fail! */
-    if (!TEST_true(!CTLOG_new_from_base64(&log, notb64, name))
-        || !TEST_true(!CTLOG_new_from_base64(&log, pad, name)))
+    if (!TEST_true(!CTLOG_new_from_base64(&ctlogp, notb64, name))
+        || !TEST_true(!CTLOG_new_from_base64(&ctlogp, pad, name)))
         return 0;
     return 1;
 }
 #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;
 }