aboutsummaryrefslogtreecommitdiff
path: root/test/x509_dup_cert_test.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-07-18 11:48:27 +1000
committerPauli <paul.dale@oracle.com>2017-07-27 07:53:08 +1000
commitad887416f1e59c3294a7d8f83a0ca77120523b4a (patch)
tree99971c4acaaa7a43efa38a0d52e230c0e68a1c6c /test/x509_dup_cert_test.c
parentd445302418b41b76c15e103954b1311d98077480 (diff)
downloadopenssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.zip
openssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.tar.gz
openssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.tar.bz2
Update the test framework so that the need for test_main is removed. Everything
that needed test_main now works using the same infrastructure as tests that used register_tests. This meant: * renaming register_tests to setup_tests and giving it a success/failure return. * renaming the init_test function to setup_test_framework. * renaming the finish_test function to pulldown_test_framework. * adding a user provided global_init function that runs before the test frame work is initialised. It returns a failure indication that stops the stest. * adding helper functions that permit tests to access their command line args. * spliting the BIO initialisation and finalisation out from the test setup and teardown. * hiding some of the now test internal functions. * fix the comments in testutil.h Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3953)
Diffstat (limited to 'test/x509_dup_cert_test.c')
-rw-r--r--test/x509_dup_cert_test.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/test/x509_dup_cert_test.c b/test/x509_dup_cert_test.c
index 2ce469a..e639c01 100644
--- 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;
}