diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-11-07 16:53:15 +0100 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-11-09 16:07:16 +0100 |
commit | e364c3b24e38bd60d40487e0a532261348a9bb10 (patch) | |
tree | 82e621604899af53aebd34ced7d7dbc381678d84 /test/sslapitest.c | |
parent | 7380737d77e89edd17651b04e439223a47ea833e (diff) | |
download | openssl-e364c3b24e38bd60d40487e0a532261348a9bb10.tar.gz |
Add main() test methods to reduce test boilerplate.
Simple tests only need to implement register_tests().
Tests that need a custom main() should implement test_main(). This will
be wrapped in a main() that performs common setup/teardown (currently
crypto-mdebug).
Note that for normal development, enable-asan is usually
sufficient for detecting leaks, and more versatile.
enable-crypto-mdebug is stricter as it will also
insist that all static variables be freed. This is useful for debugging
library init/deinit; however, it also means that test_main() must free
everything it allocates.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/sslapitest.c')
-rw-r--r-- | test/sslapitest.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index a78b0606ac..1fa9a8df9b 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -17,6 +17,7 @@ #include "ssltestlib.h" #include "testutil.h" +#include "test_main_custom.h" static char *cert = NULL; static char *privkey = NULL; @@ -863,9 +864,8 @@ static int test_ssl_bio_change_wbio(void) EXECUTE_TEST(execute_test_ssl_bio, ssl_bio_tear_down); } -int main(int argc, char *argv[]) +int test_main(int argc, char *argv[]) { - BIO *err = NULL; int testresult = 1; if (argc != 3) { @@ -876,11 +876,6 @@ int main(int argc, char *argv[]) cert = argv[1]; privkey = argv[2]; - err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT); - - CRYPTO_set_mem_debug(1); - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - ADD_TEST(test_large_message_tls); ADD_TEST(test_large_message_tls_read_ahead); #ifndef OPENSSL_NO_DTLS @@ -900,14 +895,5 @@ int main(int argc, char *argv[]) bio_s_mempacket_test_free(); -#ifndef OPENSSL_NO_CRYPTO_MDEBUG - if (CRYPTO_mem_leaks(err) <= 0) - testresult = 1; -#endif - BIO_free(err); - - if (!testresult) - printf("PASS\n"); - return testresult; } |