Fix windows compile errors in params.c

[openssl.git] / test / v3ext.c

diff --git a/test/v3ext.c b/test/v3ext.c
index f4cb568c73b3e547f310c8e1488415f35921493f..2c8ac6bb20d9ec15d67accf2382518c93e8ff41b 100644 (file)
--- a/test/v3ext.c
+++ b/test/v3ext.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -13,7 +13,6 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 
-#include "test_main_custom.h"
 #include "testutil.h"
 
 static const char *infile;
@@ -38,17 +37,13 @@ end:
     return ret;
 }
 
-int test_main(int argc, char *argv[])
-{
-    int ret;
+OPT_TEST_DECLARE_USAGE("cert.pem\n")
 
-    if (argc != 2) {
-        TEST_error("Usage error");
+int setup_tests(void)
+{
+    if (!TEST_ptr(infile = test_get_argument(0)))
         return 0;
-    }
-    infile = argv[1];
 
     ADD_TEST(test_pathlen);
-    ret = run_tests(argv[0]);
-    return ret;
+    return 1;
 }