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

[openssl.git] / test / x509_dup_cert_test.c

diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c
index 2ce469aa8379c6122a3619dcbebcfbce93f0764f..e639c019451ed5f4c28d368b20b7a9cba0b65c54 100644 (file)
--- a/test/x509_dup_cert_test.c
+++ b/test/x509_dup_cert_test.c
@@ -14,12 +14,13 @@
 
 #include "testutil.h"
 
-static int test_509_dup_cert(const char *cert_f)
+static int test_509_dup_cert(int n)
 {
     int ret = 0;
     X509_STORE_CTX *sctx = NULL;
     X509_STORE *store = NULL;
     X509_LOOKUP *lookup = NULL;
+    const char *cert_f = test_get_argument(n);
 
     if (TEST_ptr(store = X509_STORE_new())
         && TEST_ptr(lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()))
@@ -32,12 +33,15 @@ static int test_509_dup_cert(const char *cert_f)
     return ret;
 }
 
-int test_main(int argc, char **argv)
+int setup_tests(void)
 {
-    if (!TEST_int_eq(argc, 2)) {
-        TEST_info("usage: x509_dup_cert_test cert.pem");
-        return 1;
+    size_t n = test_get_argument_count();
+
+    if (!TEST_int_gt(n, 0)) {
+        TEST_note("usage: x509_dup_cert_test cert.pem...");
+        return 0;
     }
 
-    return !test_509_dup_cert(argv[1]);
+    ADD_ALL_TESTS(test_509_dup_cert, n);
+    return 1;
 }