Adjust for Joshua Sing's test replacements

2 files changed, 24 insertions, 54 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7e80c97..ed2d080 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -342,15 +342,10 @@ add_test(keypairtest keypairtest
         ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
         ${CMAKE_CURRENT_SOURCE_DIR}/server.pem)
 
-# md4test
-add_executable(md4test md4test.c)
-target_link_libraries(md4test ${OPENSSL_TEST_LIBS})
-add_test(md4test md4test)
-
-# md5test
-add_executable(md5test md5test.c)
-target_link_libraries(md5test ${OPENSSL_TEST_LIBS})
-add_test(md5test md5test)
+# md_test
+add_executable(md_test md_test.c)
+target_link_libraries(md_test ${OPENSSL_TEST_LIBS})
+add_test(md_test md_test)
 
 # mont
 add_executable(mont mont.c)
@@ -464,10 +459,10 @@ else()
         add_test(rfc5280time rfc5280time)
 endif()
 
-# rmdtest
-add_executable(rmdtest rmdtest.c)
-target_link_libraries(rmdtest ${OPENSSL_TEST_LIBS})
-add_test(rmdtest rmdtest)
+# rmd_test
+add_executable(rmd_test rmd_test.c)
+target_link_libraries(rmd_test ${OPENSSL_TEST_LIBS})
+add_test(rmd_test rmdtest)
 
 # rsa_test
 add_executable(rsa_test rsa_test.c)
@@ -484,20 +479,10 @@ else()
 endif()
 set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
 
-# sha1test
-add_executable(sha1test sha1test.c)
-target_link_libraries(sha1test ${OPENSSL_TEST_LIBS})
-add_test(sha1test sha1test)
-
-# sha256test
-add_executable(sha256test sha256test.c)
-target_link_libraries(sha256test ${OPENSSL_TEST_LIBS})
-add_test(sha256test sha256test)
-
-# sha512test
-add_executable(sha512test sha512test.c)
-target_link_libraries(sha512test ${OPENSSL_TEST_LIBS})
-add_test(sha512test sha512test)
+# sha_test
+add_executable(sha_test sha_test.c)
+target_link_libraries(sha_test ${OPENSSL_TEST_LIBS})
+add_test(sha_test sha_test)
 
 # sm3test
 add_executable(sm3test sm3test.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2a48a2b..a277dd9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -360,15 +360,10 @@ check_PROGRAMS += keypairtest
 keypairtest_SOURCES = keypairtest.c
 EXTRA_DIST += keypairtest.sh
 
-# md4test
-TESTS += md4test
-check_PROGRAMS += md4test
-md4test_SOURCES = md4test.c
-
-# md5test
-TESTS += md5test
-check_PROGRAMS += md5test
-md5test_SOURCES = md5test.c
+# md_test
+TESTS += md_test
+check_PROGRAMS += md_test
+md_test_SOURCES = md_test.c
 
 # mont
 TESTS += mont
@@ -472,10 +467,10 @@ TESTS += rfc5280time
 endif
 EXTRA_DIST += rfc5280time_small.test
 
-# rmdtest
-TESTS += rmdtest
-check_PROGRAMS += rmdtest
-rmdtest_SOURCES = rmdtest.c
+# rmd_test
+TESTS += rmd_test
+check_PROGRAMS += rmd_test
+rmd_test_SOURCES = rmd_test.c
 
 # rsa_test
 TESTS += rsa_test
@@ -488,20 +483,10 @@ check_PROGRAMS += servertest
 servertest_SOURCES = servertest.c
 EXTRA_DIST += servertest.sh servertest.bat
 
-# sha1test
-TESTS += sha1test
-check_PROGRAMS += sha1test
-sha1test_SOURCES = sha1test.c
-
-# sha256test
-TESTS += sha256test
-check_PROGRAMS += sha256test
-sha256test_SOURCES = sha256test.c
-
-# sha512test
-TESTS += sha512test
-check_PROGRAMS += sha512test
-sha512test_SOURCES = sha512test.c
+# sha_test
+TESTS += sha_test
+check_PROGRAMS += sha_test
+sha_test_SOURCES = sha_test.c
 
 # sm3test
 TESTS += sm3test