summaryrefslogtreecommitdiffstats
path: root/test/wpackettest.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-07-18 03:48:27 +0200
committerPauli <paul.dale@oracle.com>2017-07-26 23:53:08 +0200
commitad887416f1e59c3294a7d8f83a0ca77120523b4a (patch)
tree99971c4acaaa7a43efa38a0d52e230c0e68a1c6c /test/wpackettest.c
parentSimplify the handling of shared library version numbers (diff)
downloadopenssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.tar.xz
openssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.zip
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/wpackettest.c')
-rw-r--r--test/wpackettest.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/wpackettest.c b/test/wpackettest.c
index 5c7ea10165..773eef0525 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -360,10 +360,8 @@ static int test_WPACKET_memcpy(void)
return 1;
}
-int test_main(int argc, char *argv[])
+int setup_tests(void)
{
- int testresult = 0;
-
if (!TEST_ptr(buf = BUF_MEM_new()))
return 0;
@@ -373,8 +371,10 @@ int test_main(int argc, char *argv[])
ADD_TEST(test_WPACKET_set_flags);
ADD_TEST(test_WPACKET_allocate_bytes);
ADD_TEST(test_WPACKET_memcpy);
- testresult = run_tests(argv[0]);
+ return 1;
+}
+void cleanup_tests(void)
+{
BUF_MEM_free(buf);
- return testresult;
}