From 3ef97bd8cbaa7cd8ac323978207606293a48ba0d Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 7 Aug 2018 10:23:01 +1000 Subject: [PATCH] Relocate memcmp test. The CRYPTO_memcmp test isn't testing the test framework. It would seem to better belong in the sanity tests. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/6878) --- test/sanitytest.c | 6 ++++++ test/test_test.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/sanitytest.c b/test/sanitytest.c index da74e7eca1..0aaf3f456f 100644 --- a/test/sanitytest.c +++ b/test/sanitytest.c @@ -84,6 +84,11 @@ static int test_sanity_range(void) return 1; } +static int test_sanity_memcmp(void) +{ + return CRYPTO_memcmp("ab","cd",2); +} + int setup_tests(void) { ADD_TEST(test_sanity_null_zero); @@ -92,6 +97,7 @@ int setup_tests(void) ADD_TEST(test_sanity_sign); ADD_TEST(test_sanity_unsigned_conversion); ADD_TEST(test_sanity_range); + ADD_TEST(test_sanity_memcmp); return 1; } diff --git a/test/test_test.c b/test/test_test.c index 18b61c6d0b..0af2eaeb8a 100644 --- a/test/test_test.c +++ b/test/test_test.c @@ -531,11 +531,6 @@ static int test_bn_output(int n) return 1; } -static int test_memcmp(void) -{ - return CRYPTO_memcmp("ab","cd",2); -} - int setup_tests(void) { ADD_TEST(test_int); @@ -557,7 +552,6 @@ int setup_tests(void) ADD_TEST(test_messages); ADD_TEST(test_single_eval); ADD_TEST(test_output); - ADD_TEST(test_memcmp); ADD_ALL_TESTS(test_bn_output, OSSL_NELEM(bn_output_tests)); return 1; } -- 2.25.1