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 <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6878)

diff --git a/test/sanitytest.c b/test/sanitytest.c
index da74e7eca1ac668303cb0fd1163ae2646db488cb..0aaf3f456f97b66fb7342165736ce7a08f92e052 100644 (file)
--- 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 18b61c6d0b1005f80baafccb225c1eb151b237e8..0af2eaeb8ad58a640c4b635d0348e552f36370ba 100644 (file)
--- 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;
 }