Add a test for the info callback

[openssl.git] / test / cipherbytes_test.c

diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c
index 00e361b73f5c230029d861808cbfa1ac70fa5693..6418b42408c8518af8eacc3fd3b12bda4c1fb171 100644 (file)
--- a/test/cipherbytes_test.c
+++ b/test/cipherbytes_test.c
@@ -18,9 +18,8 @@
 #include <openssl/ssl3.h>
 #include <openssl/tls1.h>
 
-#include "e_os.h"
+#include "internal/nelem.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 static SSL_CTX *ctx;
 static SSL *s;
@@ -130,22 +129,21 @@ err:
     return ret;
 }
 
-int test_main(int argc, char **argv)
+int setup_tests(void)
 {
-    int ret;
-
     if (!TEST_ptr(ctx = SSL_CTX_new(TLS_server_method()))
             || !TEST_ptr(s = SSL_new(ctx)))
-        return EXIT_FAILURE;
+        return 0;
 
     ADD_TEST(test_empty);
     ADD_TEST(test_unsupported);
     ADD_TEST(test_v2);
     ADD_TEST(test_v3);
-    ret = run_tests(argv[0]);
+    return 1;
+}
 
+void cleanup_tests(void)
+{
     SSL_free(s);
     SSL_CTX_free(ctx);
-
-    return ret;
 }