diff options
author | Matt Caswell <matt@openssl.org> | 2016-06-13 11:55:29 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-06-13 17:35:18 +0100 |
commit | c887104f4ac27a2743c0c830d20c1e341180a48b (patch) | |
tree | d1039bed8d135382694ce9f82d9dc0d2c621b818 /test/sslapitest.c | |
parent | ec02df83e6f41bce3a2b4d97ff013a3fd632259d (diff) |
Update sslapitest to use the test framework
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/sslapitest.c')
-rw-r--r-- | test/sslapitest.c | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index 4c94f27cbc..f16947b5ca 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -13,6 +13,7 @@ #include <openssl/ssl.h> #include "ssltestlib.h" +#include "testutil.h" static char *cert = NULL; static char *privkey = NULL; @@ -171,25 +172,14 @@ static int test_session(void) return testresult; } -#define RUNTEST(testname) \ - do { \ - printf("Testing " #testname "..."); \ - if (test_##testname()) {\ - printf("ok\n"); \ - } else { \ - printf("not ok\n"); \ - goto end; \ - } \ - } while(0) - int main(int argc, char *argv[]) { - BIO *err; - int testresult = 0; + BIO *err = NULL; + int testresult = 1; if (argc != 3) { printf("Invalid argument count\n"); - goto end; + return 1; } cert = argv[1]; @@ -200,21 +190,19 @@ int main(int argc, char *argv[]) CRYPTO_set_mem_debug(1); CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - RUNTEST(tlsext_status_type); - RUNTEST(session); + ADD_TEST(test_tlsext_status_type); + ADD_TEST(test_session); - testresult = 1; - - end: + testresult = run_tests(argv[0]); #ifndef OPENSSL_NO_CRYPTO_MDEBUG if (CRYPTO_mem_leaks(err) <= 0) - testresult = 0; + testresult = 1; #endif BIO_free(err); - if (testresult) + if (!testresult) printf("PASS\n"); - return testresult ? 0 : 1; + return testresult; } |