From 80b06b0cc067e908f512ccf5f2d283d41c050a8f Mon Sep 17 00:00:00 2001 From: Todd Short Date: Wed, 12 Apr 2017 16:32:38 -0400 Subject: [PATCH] Fix unit tests when no-bf configured Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3206) --- test/bftest.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/test/bftest.c b/test/bftest.c index 978fd582b1..eea9fcb7b9 100644 --- a/test/bftest.c +++ b/test/bftest.c @@ -22,13 +22,7 @@ #include "../e_os.h" -#ifdef OPENSSL_NO_BF -int main(int argc, char *argv[]) -{ - printf("No BF support\n"); - return (0); -} -#else +#ifndef OPENSSL_NO_BF # include # ifdef CHARSET_EBCDIC @@ -440,10 +434,11 @@ static int test_bf_ofb64(void) return ret; } +#endif int test_main(int argc, char *argv[]) { - int ret; +#ifndef OPENSSL_NO_BF # ifdef CHARSET_EBCDIC int n; @@ -461,10 +456,7 @@ int test_main(int argc, char *argv[]) ADD_TEST(test_bf_ofb64); if (argc > 1) - ret = print_test_data(); - else - ret = run_tests(argv[0]); - - return ret; -} + return print_test_data(); #endif + return run_tests(argv[0]); +} -- 2.39.2