Hook a few more tests to the build

3 files changed, 97 insertions, 1 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9a6242c..f53495f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -40,6 +40,13 @@ add_executable(aes_wrap aes_wrap.c)
 target_link_libraries(aes_wrap ${OPENSSL_TEST_LIBS})
 add_test(aes_wrap aes_wrap)
 
+# apitest
+add_executable(apitest apitest.c)
+target_link_libraries(apitest ${OPENSSL_TEST_LIBS})
+set_source_files_properties(apitest.c PROPERTIES COMPILE_FLAGS
+        -DCERTSDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\")
+add_test(apitest apitest)
+
 # arc4randomforktest
 # Windows/mingw does not have fork, but Cygwin does.
 if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES "MINGW")))
@@ -146,6 +153,8 @@ add_executable(bn_gcd bn_cmp.c)
 target_link_libraries(bn_gcd ${OPENSSL_TEST_LIBS})
 add_test(bn_gcd bn_gcd)
 
+# bn_general is a benchmark
+
 # bn_isqrt
 add_executable(bn_isqrt bn_isqrt.c)
 target_link_libraries(bn_isqrt ${OPENSSL_TEST_LIBS})
@@ -215,6 +224,9 @@ add_executable(bytestringtest bytestringtest.c)
 target_link_libraries(bytestringtest ${OPENSSL_TEST_LIBS})
 add_test(bytestringtest bytestringtest)
 
+# callback
+# callbackfailures
+
 # casttest
 add_executable(casttest casttest.c)
 target_link_libraries(casttest ${OPENSSL_TEST_LIBS})
@@ -260,6 +272,13 @@ add_executable(cts128test cts128test.c)
 target_link_libraries(cts128test ${OPENSSL_TEST_LIBS})
 add_test(cts128test cts128test)
 
+# cttest
+add_executable(cttest cttest.c)
+target_link_libraries(cttest ${OPENSSL_TEST_LIBS})
+set_source_files_properties(cttest.c PROPERTIES COMPILE_FLAGS
+        -DCTPATH=\\"${CMAKE_CURRENT_SOURCE_DIR}\\")
+add_test(cttest cttest)
+
 # destest
 add_executable(destest destest.c)
 target_link_libraries(destest ${OPENSSL_TEST_LIBS})
@@ -339,6 +358,13 @@ add_executable(evptest evptest.c)
 target_link_libraries(evptest ${OPENSSL_TEST_LIBS})
 add_test(evptest evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptests.txt)
 
+# evp_test
+add_executable(evp_test evp_test.c)
+target_link_libraries(evp_test ${OPENSSL_TEST_LIBS})
+add_test(evp_test evp_test)
+
+# expirecallback.c
+
 # explicit_bzero
 # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows
 if(NOT WIN32)
@@ -351,6 +377,11 @@ if(NOT WIN32)
         add_test(explicit_bzero explicit_bzero)
 endif()
 
+# exportertest
+add_executable(exportertest exportertest.c)
+target_link_libraries(exportertest ${OPENSSL_TEST_LIBS})
+add_test(exportertest exportertest)
+
 # freenull
 add_executable(freenull freenull.c)
 set_source_files_properties(freenull.c PROPERTIES COMPILE_FLAGS
@@ -393,11 +424,14 @@ add_executable(igetest igetest.c)
 target_link_libraries(igetest ${OPENSSL_TEST_LIBS})
 add_test(igetest igetest)
 
-# keypairtest
+# init_pledge
+
+# key_schedule
 add_executable(key_schedule key_schedule.c)
 target_link_libraries(key_schedule ${OPENSSL_TEST_LIBS})
 add_test(key_schedule key_schedule)
 
+# keypair
 add_executable(keypairtest keypairtest.c)
 target_link_libraries(keypairtest ${LIBTLS_TEST_LIBS})
 target_include_directories(keypairtest BEFORE PUBLIC ../tls)
@@ -528,6 +562,8 @@ add_executable(rsa_test rsa_test.c)
 target_link_libraries(rsa_test ${OPENSSL_TEST_LIBS})
 add_test(rsa_test rsa_test)
 
+# server.c
+
 # servertest
 add_executable(servertest servertest.c)
 target_link_libraries(servertest ${OPENSSL_TEST_LIBS})
@@ -543,6 +579,18 @@ add_executable(sha_test sha_test.c)
 target_link_libraries(sha_test ${OPENSSL_TEST_LIBS})
 add_test(sha_test sha_test)
 
+# signertest
+add_executable(signertest signertest.c)
+target_link_libraries(signertest ${LIBTLS_TEST_LIBS})
+target_include_directories(signertest BEFORE PUBLIC ../tls)
+set_source_files_properties(signertest.c PROPERTIES COMPILE_FLAGS
+        -DCERTSDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\")
+add_test(signertest signertest)
+
+# sm2crypttest
+# sm2evptest
+# sm2sigtest
+
 # sm3test
 add_executable(sm3test sm3test.c)
 target_link_libraries(sm3test ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aebfed1..b0e1128 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,6 +57,12 @@ TESTS += aes_wrap
 check_PROGRAMS += aes_wrap
 aes_wrap_SOURCES = aes_wrap.c
 
+# apitest
+TESTS += apitest
+check_PROGRAMS += apitest
+apitest_SOURCES = apitest.c
+apitest_CPPFLAGS = $(AM_CPPFLAGS) -DCERTSDIR=\"$(srcdir)\"
+
 # arc4randomforktest
 # Windows/mingw does not have fork, but Cygwin does.
 if !HOST_WIN
@@ -164,6 +170,8 @@ TESTS += bn_gcd
 check_PROGRAMS += bn_gcd
 bn_gcd_SOURCES = bn_gcd.c
 
+# bn_general is a benchmark.
+
 # bn_isqrt
 TESTS += bn_isqrt
 check_PROGRAMS += bn_isqrt
@@ -231,6 +239,9 @@ TESTS += bytestringtest
 check_PROGRAMS += bytestringtest
 bytestringtest_SOURCES = bytestringtest.c
 
+# callback
+# callbackfailures
+
 # casttest
 TESTS += casttest
 check_PROGRAMS += casttest
@@ -277,6 +288,15 @@ TESTS += cts128test
 check_PROGRAMS += cts128test
 cts128test_SOURCES = cts128test.c
 
+# cttest
+TESTS += cttest
+check_PROGRAMS += cttest
+cttest_SOURCES = cttest.c
+cttest_CPPFLAGS = $(AM_CPPFLAGS) -DCTPATH=\"$(srcdir)\"
+EXTRA_DIST += ctlog.conf
+EXTRA_DIST += letsencrypt-r3.crt
+EXTRA_DIST += libressl.org.crt
+
 # destest
 TESTS += destest
 check_PROGRAMS += destest
@@ -358,6 +378,13 @@ evptest_SOURCES = evptest.c
 EXTRA_DIST += evptest.sh
 EXTRA_DIST += evptests.txt
 
+# evp_test
+TESTS += evp_test
+check_PROGRAMS += evp_test
+evp_test_SOURCES = evp_test.c
+
+# expirecallback.c
+
 # explicit_bzero
 # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows
 if !HOST_WIN
@@ -371,6 +398,11 @@ endif
 endif
 endif
 
+# exportertest
+TESTS += exportertest
+check_PROGRAMS += exportertest
+exportertest_SOURCES = exportertest.c
+
 # freenull
 TESTS += freenull
 freenull_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
@@ -412,6 +444,8 @@ TESTS += igetest
 check_PROGRAMS += igetest
 igetest_SOURCES = igetest.c
 
+# init_pledge.c
+
 # key_schedule
 TESTS += key_schedule
 check_PROGRAMS += key_schedule
@@ -536,6 +570,8 @@ TESTS += rsa_test
 check_PROGRAMS += rsa_test
 rsa_test_SOURCES = rsa_test.c
 
+# server.c
+
 # servertest
 TESTS += servertest.sh
 check_PROGRAMS += servertest
@@ -547,6 +583,16 @@ TESTS += sha_test
 check_PROGRAMS += sha_test
 sha_test_SOURCES = sha_test.c
 
+# signertest
+TESTS += signertest
+check_PROGRAMS += signertest
+signertest_CPPFLAGS = -I $(top_srcdir)/tls $(AM_CPPFLAGS) -DCERTSDIR=\"$(srcdir)\"
+signertest_SOURCES = signertest.c
+
+# sm2crypttest
+# sm2evptest
+# sm2sigtest
+
 # sm3test
 TESTS += sm3test
 check_PROGRAMS += sm3test
diff --git a/update.sh b/update.sh
index e4fac1d..46aa483 100755
--- a/update.sh
+++ b/update.sh
@@ -353,6 +353,8 @@ for i in `find $libcrypto_regress -name '*.c'`; do
 done
 $CP $libcrypto_regress/evp/evptests.txt tests
 $CP $libcrypto_regress/aead/*.txt tests
+$CP $libcrypto_regress/ct/ctlog.conf tests
+$CP $libcrypto_regress/ct/*.crt tests
 
 # generate libcrypto freenull.c
 awk -f $libcrypto_regress/free/freenull.awk \