X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fbuild.info;h=1a474634c566fc034a38ec9458f2814097acd70f;hp=d6e43cf7b318cce5700beb13230c9d280e5849b2;hb=9f27d4bf32c0465270e1922365b21825a0f7a42a;hpb=f3ab6c16c424054c8d6d2c152744dcbaf41c3232

diff --git a/test/build.info b/test/build.info
index d6e43cf7b3..1a474634c5 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,3 +1,4 @@
+SUBDIRS=ossl_shim
 {-
      use File::Spec::Functions;
      sub rebase_files
@@ -5,412 +6,583 @@
          my ($base, $files) = @_;
          return join(" ", map { "$base/$_" } split(/\s+/, $files));
      }
-     our $apps_extra =
-         $config{target} =~ /^vms-/ ? "../apps/vms_term_sock.c" : "";
      ""
 -}
 IF[{- !$disabled{tests} -}]
-  PROGRAMS_NO_INST=\
+  LIBS{noinst,has_main}=libtestutil.a
+  SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
+          testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \
+          testutil/format_output.c testutil/tap_bio.c \
+          testutil/test_cleanup.c testutil/main.c testutil/init.c \
+          testutil/options.c testutil/test_options.c ../apps/opt.c
+  INCLUDE[libtestutil.a]=../include ../apps/include ..
+  DEPEND[libtestutil.a]=../libcrypto
+
+  PROGRAMS{noinst}=\
+          versions \
           aborttest test_test \
-          sanitytest exdatatest bntest \
-          ectest ecdsatest gmdifftest pbelutest ideatest \
+          sanitytest rsa_complex exdatatest bntest \
+          ectest ecstresstest ecdsatest gmdifftest pbelutest ideatest \
           md2test \
           hmactest \
           rc2test rc4test rc5test \
-          destest sha1test sha256t sha512t \
-          mdc2test \
-          randtest dhtest enginetest casttest \
-          bftest ssltest_old dsatest exptest rsa_test \
+          destest mdc2test \
+          dhtest enginetest casttest \
+          bftest ssltest_old dsatest dsa_no_digest_size_test exptest rsa_test \
           evp_test evp_extra_test igetest v3nametest v3ext \
-          crltest danetest bad_dtls_test lhash_test \
+          crltest danetest bad_dtls_test lhash_test sparse_array_test \
+          conf_include_test \
           constant_time_test verify_extra_test clienthellotest \
           packettest asynctest secmemtest srptest memleaktest stack_test \
           dtlsv1listentest ct_test threadstest afalgtest d2i_test \
           ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \
+          bio_callback_test bio_memleak_test \
           bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \
-          pkey_meth_test uitest cipherbytes_test asn1_encode_test \
-          x509_time_test recordlentest
+          pkey_meth_test pkey_meth_kdf_test evp_kdf_test uitest \
+          cipherbytes_test \
+          asn1_encode_test asn1_decode_test asn1_string_table_test \
+          x509_time_test x509_dup_cert_test x509_check_cert_pkey_test \
+          recordlentest drbgtest sslbuffertest \
+          recordlentest drbgtest drbg_cavs_test sslbuffertest \
+          time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \
+          servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \
+          sysdefaulttest errtest gosttest \
+          context_internal_test
+
+  SOURCE[versions]=versions.c
+  INCLUDE[versions]=../include ../apps/include
+  DEPEND[versions]=../libcrypto
 
   SOURCE[aborttest]=aborttest.c
-  INCLUDE[aborttest]=../include
+  INCLUDE[aborttest]=../include ../apps/include
   DEPEND[aborttest]=../libcrypto
 
-  SOURCE[sanitytest]=sanitytest.c testutil.c test_main.c
-  INCLUDE[sanitytest]=../include
-  DEPEND[sanitytest]=../libcrypto
+  SOURCE[sanitytest]=sanitytest.c
+  INCLUDE[sanitytest]=../include ../apps/include
+  DEPEND[sanitytest]=../libcrypto libtestutil.a
 
-  SOURCE[test_test]=test_test.c testutil.c test_main.c
-  INCLUDE[test_test]=.. ../include
-  DEPEND[test_test]=../libcrypto
+  SOURCE[rsa_complex]=rsa_complex.c
+  INCLUDE[rsa_complex]=../include ../apps/include
 
-  SOURCE[exdatatest]=exdatatest.c testutil.c test_main.c
-  INCLUDE[exdatatest]=../include
-  DEPEND[exdatatest]=../libcrypto
+  SOURCE[test_test]=test_test.c
+  INCLUDE[test_test]=../include ../apps/include
+  DEPEND[test_test]=../libcrypto libtestutil.a
 
-  SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
-  INCLUDE[bntest]=.. ../crypto/include ../include
-  DEPEND[bntest]=../libcrypto
+  SOURCE[exdatatest]=exdatatest.c
+  INCLUDE[exdatatest]=../include ../apps/include
+  DEPEND[exdatatest]=../libcrypto libtestutil.a
 
-  SOURCE[ectest]=ectest.c
-  INCLUDE[ectest]=.. ../include
-  DEPEND[ectest]=../libcrypto
-
-  SOURCE[ecdsatest]=ecdsatest.c testutil.c test_main.c
-  INCLUDE[ecdsatest]=../include
-  DEPEND[ecdsatest]=../libcrypto
+  SOURCE[bntest]=bntest.c
+  INCLUDE[bntest]=../include ../apps/include
+  DEPEND[bntest]=../libcrypto libtestutil.a
 
-  SOURCE[gmdifftest]=gmdifftest.c testutil.c test_main.c
-  INCLUDE[gmdifftest]=../include
-  DEPEND[gmdifftest]=../libcrypto
+  SOURCE[ectest]=ectest.c
+  INCLUDE[ectest]=../include ../apps/include
+  DEPEND[ectest]=../libcrypto libtestutil.a
 
-  SOURCE[pbelutest]=pbelutest.c testutil.c test_main.c
-  INCLUDE[pbelutest]=../include
-  DEPEND[pbelutest]=../libcrypto
+  SOURCE[ecstresstest]=ecstresstest.c
+  INCLUDE[ecstresstest]=../include ../apps/include
+  DEPEND[ecstresstest]=../libcrypto libtestutil.a
 
-  SOURCE[ideatest]=ideatest.c testutil.c test_main.c
-  INCLUDE[ideatest]=../include
-  DEPEND[ideatest]=../libcrypto
+  SOURCE[ecdsatest]=ecdsatest.c
+  INCLUDE[ecdsatest]=../include ../apps/include
+  DEPEND[ecdsatest]=../libcrypto libtestutil.a
 
-  SOURCE[md2test]=md2test.c testutil.c test_main.c
-  INCLUDE[md2test]=../include
-  DEPEND[md2test]=../libcrypto
+  SOURCE[gmdifftest]=gmdifftest.c
+  INCLUDE[gmdifftest]=../include ../apps/include
+  DEPEND[gmdifftest]=../libcrypto libtestutil.a
 
-  SOURCE[hmactest]=hmactest.c
-  INCLUDE[hmactest]=../include
-  DEPEND[hmactest]=../libcrypto
+  SOURCE[pbelutest]=pbelutest.c
+  INCLUDE[pbelutest]=../include ../apps/include
+  DEPEND[pbelutest]=../libcrypto libtestutil.a
 
-  SOURCE[rc2test]=rc2test.c testutil.c test_main.c
-  INCLUDE[rc2test]=../include
-  DEPEND[rc2test]=../libcrypto
+  SOURCE[ideatest]=ideatest.c
+  INCLUDE[ideatest]=../include ../apps/include
+  DEPEND[ideatest]=../libcrypto libtestutil.a
 
-  SOURCE[rc4test]=rc4test.c testutil.c test_main.c
-  INCLUDE[rc4test]=../include
-  DEPEND[rc4test]=../libcrypto
+  SOURCE[md2test]=md2test.c
+  INCLUDE[md2test]=../include ../apps/include
+  DEPEND[md2test]=../libcrypto libtestutil.a
 
-  SOURCE[rc5test]=rc5test.c testutil.c test_main.c
-  INCLUDE[rc5test]=../include
-  DEPEND[rc5test]=../libcrypto
-
-  SOURCE[destest]=destest.c testutil.c test_main.c
-  INCLUDE[destest]=../include
-  DEPEND[destest]=../libcrypto
+  SOURCE[hmactest]=hmactest.c
+  INCLUDE[hmactest]=../include ../apps/include
+  DEPEND[hmactest]=../libcrypto libtestutil.a
 
-  SOURCE[sha1test]=sha1test.c testutil.c test_main.c
-  INCLUDE[sha1test]=../include
-  DEPEND[sha1test]=../libcrypto
+  SOURCE[rc2test]=rc2test.c
+  INCLUDE[rc2test]=../include ../apps/include
+  DEPEND[rc2test]=../libcrypto libtestutil.a
 
-  SOURCE[sha256t]=sha256t.c testutil.c test_main.c
-  INCLUDE[sha256t]=../include
-  DEPEND[sha256t]=../libcrypto
+  SOURCE[rc4test]=rc4test.c
+  INCLUDE[rc4test]=../include ../apps/include
+  DEPEND[rc4test]=../libcrypto libtestutil.a
 
-  SOURCE[sha512t]=sha512t.c testutil.c test_main.c
-  INCLUDE[sha512t]=../include
-  DEPEND[sha512t]=../libcrypto
+  SOURCE[rc5test]=rc5test.c
+  INCLUDE[rc5test]=../include ../apps/include
+  DEPEND[rc5test]=../libcrypto libtestutil.a
 
-  SOURCE[mdc2test]=mdc2test.c testutil.c test_main.c
-  INCLUDE[mdc2test]=../include
-  DEPEND[mdc2test]=../libcrypto
+  SOURCE[destest]=destest.c
+  INCLUDE[destest]=../include ../apps/include
+  DEPEND[destest]=../libcrypto libtestutil.a
 
-  SOURCE[randtest]=randtest.c testutil.c test_main.c
-  INCLUDE[randtest]=../include
-  DEPEND[randtest]=../libcrypto
+  SOURCE[mdc2test]=mdc2test.c
+  INCLUDE[mdc2test]=../include ../apps/include
+  DEPEND[mdc2test]=../libcrypto libtestutil.a
 
   SOURCE[dhtest]=dhtest.c
-  INCLUDE[dhtest]=../include
-  DEPEND[dhtest]=../libcrypto
+  INCLUDE[dhtest]=../include ../apps/include
+  DEPEND[dhtest]=../libcrypto libtestutil.a
 
-  SOURCE[enginetest]=enginetest.c testutil.c test_main.c
-  INCLUDE[enginetest]=../include
-  DEPEND[enginetest]=../libcrypto
+  SOURCE[enginetest]=enginetest.c
+  INCLUDE[enginetest]=../include ../apps/include
+  DEPEND[enginetest]=../libcrypto libtestutil.a
 
-  SOURCE[casttest]=casttest.c testutil.c test_main.c
-  INCLUDE[casttest]=.. ../include
-  DEPEND[casttest]=../libcrypto
+  SOURCE[casttest]=casttest.c
+  INCLUDE[casttest]=../include ../apps/include
+  DEPEND[casttest]=../libcrypto libtestutil.a
 
-  SOURCE[bftest]=bftest.c testutil.c test_main_custom.c
-  INCLUDE[bftest]=../include
-  DEPEND[bftest]=../libcrypto
+  SOURCE[bftest]=bftest.c
+  INCLUDE[bftest]=../include ../apps/include
+  DEPEND[bftest]=../libcrypto libtestutil.a
 
   SOURCE[ssltest_old]=ssltest_old.c
-  INCLUDE[ssltest_old]=.. ../include
+  INCLUDE[ssltest_old]=.. ../include ../apps/include
   DEPEND[ssltest_old]=../libcrypto ../libssl
 
   SOURCE[dsatest]=dsatest.c
-  INCLUDE[dsatest]=../include
-  DEPEND[dsatest]=../libcrypto
+  INCLUDE[dsatest]=../include ../apps/include
+  DEPEND[dsatest]=../libcrypto libtestutil.a
+
+  SOURCE[dsa_no_digest_size_test]=dsa_no_digest_size_test.c
+  INCLUDE[dsa_no_digest_size_test]=../include ../apps/include
+  DEPEND[dsa_no_digest_size_test]=../libcrypto libtestutil.a
 
   SOURCE[exptest]=exptest.c
-  INCLUDE[exptest]=../include
-  DEPEND[exptest]=../libcrypto
+  INCLUDE[exptest]=../include ../apps/include
+  DEPEND[exptest]=../libcrypto libtestutil.a
 
-  SOURCE[rsa_test]=rsa_test.c testutil.c test_main.c
-  INCLUDE[rsa_test]=.. ../include
-  DEPEND[rsa_test]=../libcrypto
+  SOURCE[rsa_test]=rsa_test.c
+  INCLUDE[rsa_test]=../include ../apps/include
+  DEPEND[rsa_test]=../libcrypto libtestutil.a
+
+  SOURCE[rsa_mp_test]=rsa_mp_test.c
+  INCLUDE[rsa_mp_test]=../include ../apps/include
+  DEPEND[rsa_mp_test]=../libcrypto libtestutil.a
+
+  SOURCE[fatalerrtest]=fatalerrtest.c ssltestlib.c
+  INCLUDE[fatalerrtest]=../include ../apps/include
+  DEPEND[fatalerrtest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[tls13ccstest]=tls13ccstest.c ssltestlib.c
+  INCLUDE[tls13ccstest]=../include ../apps/include
+  DEPEND[tls13ccstest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[evp_test]=evp_test.c
-  INCLUDE[evp_test]=../include
-  DEPEND[evp_test]=../libcrypto
+  INCLUDE[evp_test]=../include ../apps/include
+  DEPEND[evp_test]=../libcrypto libtestutil.a
 
   SOURCE[evp_extra_test]=evp_extra_test.c
-  INCLUDE[evp_extra_test]=../include
-  DEPEND[evp_extra_test]=../libcrypto
+  INCLUDE[evp_extra_test]=../include ../apps/include ../crypto/include
+  DEPEND[evp_extra_test]=../libcrypto libtestutil.a
 
   SOURCE[igetest]=igetest.c
-  INCLUDE[igetest]=.. ../include
-  DEPEND[igetest]=../libcrypto
+  INCLUDE[igetest]=../include ../apps/include
+  DEPEND[igetest]=../libcrypto libtestutil.a
 
-  SOURCE[v3nametest]=v3nametest.c testutil.c test_main.c
-  INCLUDE[v3nametest]=.. ../include
-  DEPEND[v3nametest]=../libcrypto
+  SOURCE[v3nametest]=v3nametest.c
+  INCLUDE[v3nametest]=../include ../apps/include
+  DEPEND[v3nametest]=../libcrypto libtestutil.a
 
-  SOURCE[crltest]=crltest.c testutil.c test_main.c
-  INCLUDE[crltest]=../include
-  DEPEND[crltest]=../libcrypto
+  SOURCE[crltest]=crltest.c
+  INCLUDE[crltest]=../include ../apps/include
+  DEPEND[crltest]=../libcrypto libtestutil.a
 
-  SOURCE[v3ext]=v3ext.c testutil.c test_main_custom.c
-  INCLUDE[v3ext]=../include
-  DEPEND[v3ext]=../libcrypto
+  SOURCE[v3ext]=v3ext.c
+  INCLUDE[v3ext]=../include ../apps/include
+  DEPEND[v3ext]=../libcrypto libtestutil.a
 
   SOURCE[danetest]=danetest.c
-  INCLUDE[danetest]=../include
-  DEPEND[danetest]=../libcrypto ../libssl
+  INCLUDE[danetest]=../include ../apps/include
+  DEPEND[danetest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[constant_time_test]=constant_time_test.c testutil.c test_main.c
-  INCLUDE[constant_time_test]=.. ../include
-  DEPEND[constant_time_test]=../libcrypto
+  SOURCE[constant_time_test]=constant_time_test.c
+  INCLUDE[constant_time_test]=../include ../apps/include
+  DEPEND[constant_time_test]=../libcrypto libtestutil.a
 
-  SOURCE[verify_extra_test]=verify_extra_test.c testutil.c test_main_custom.c
-  INCLUDE[verify_extra_test]=../include
-  DEPEND[verify_extra_test]=../libcrypto
+  SOURCE[verify_extra_test]=verify_extra_test.c
+  INCLUDE[verify_extra_test]=../include ../apps/include
+  DEPEND[verify_extra_test]=../libcrypto libtestutil.a
 
-  SOURCE[clienthellotest]=clienthellotest.c testutil.c test_main_custom.c
-  INCLUDE[clienthellotest]=../include
-  DEPEND[clienthellotest]=../libcrypto ../libssl
+  SOURCE[clienthellotest]=clienthellotest.c
+  INCLUDE[clienthellotest]=../include ../apps/include
+  DEPEND[clienthellotest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[bad_dtls_test]=bad_dtls_test.c testutil.c test_main.c
-  INCLUDE[bad_dtls_test]=../include
-  DEPEND[bad_dtls_test]=../libcrypto ../libssl
+  SOURCE[bad_dtls_test]=bad_dtls_test.c
+  INCLUDE[bad_dtls_test]=../include ../apps/include
+  DEPEND[bad_dtls_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[packettest]=packettest.c
-  INCLUDE[packettest]=../include
-  DEPEND[packettest]=../libcrypto
+  INCLUDE[packettest]=../include ../apps/include
+  DEPEND[packettest]=../libcrypto libtestutil.a
 
   SOURCE[asynctest]=asynctest.c
-  INCLUDE[asynctest]=.. ../include
+  INCLUDE[asynctest]=../include ../apps/include
   DEPEND[asynctest]=../libcrypto
 
-  SOURCE[secmemtest]=secmemtest.c testutil.c test_main.c
-  INCLUDE[secmemtest]=../include
-  DEPEND[secmemtest]=../libcrypto
+  SOURCE[secmemtest]=secmemtest.c
+  INCLUDE[secmemtest]=../include ../apps/include
+  DEPEND[secmemtest]=../libcrypto libtestutil.a
 
-  SOURCE[srptest]=srptest.c testutil.c test_main.c
-  INCLUDE[srptest]=../include
-  DEPEND[srptest]=../libcrypto
+  SOURCE[srptest]=srptest.c
+  INCLUDE[srptest]=../include ../apps/include
+  DEPEND[srptest]=../libcrypto libtestutil.a
 
-  SOURCE[memleaktest]=memleaktest.c testutil.c
-  INCLUDE[memleaktest]=../include
-  DEPEND[memleaktest]=../libcrypto
+  SOURCE[memleaktest]=memleaktest.c
+  INCLUDE[memleaktest]=../include ../apps/include
+  DEPEND[memleaktest]=../libcrypto libtestutil.a
 
-  SOURCE[stack_test]=stack_test.c testutil.c test_main.c
-  INCLUDE[stack_test]=.. ../include
-  DEPEND[stack_test]=../libcrypto
+  SOURCE[stack_test]=stack_test.c
+  INCLUDE[stack_test]=../include ../apps/include
+  DEPEND[stack_test]=../libcrypto libtestutil.a
 
-  SOURCE[lhash_test]=lhash_test.c testutil.c test_main.c
-  INCLUDE[lhash_test]=.. ../include
-  DEPEND[lhash_test]=../libcrypto
+  SOURCE[lhash_test]=lhash_test.c
+  INCLUDE[lhash_test]=../include ../apps/include
+  DEPEND[lhash_test]=../libcrypto libtestutil.a
 
   SOURCE[dtlsv1listentest]=dtlsv1listentest.c
-  INCLUDE[dtlsv1listentest]=.. ../include
-  DEPEND[dtlsv1listentest]=../libssl
+  INCLUDE[dtlsv1listentest]=../include ../apps/include
+  DEPEND[dtlsv1listentest]=../libssl libtestutil.a
 
-  SOURCE[ct_test]=ct_test.c testutil.c test_main_custom.c
-  INCLUDE[ct_test]=../crypto/include ../include
-  DEPEND[ct_test]=../libcrypto
+  SOURCE[ct_test]=ct_test.c
+  INCLUDE[ct_test]=../include ../apps/include
+  DEPEND[ct_test]=../libcrypto libtestutil.a
 
-  SOURCE[threadstest]=threadstest.c testutil.c test_main.c
-  INCLUDE[threadstest]=.. ../include
-  DEPEND[threadstest]=../libcrypto
+  SOURCE[threadstest]=threadstest.c
+  INCLUDE[threadstest]=../include ../apps/include
+  DEPEND[threadstest]=../libcrypto libtestutil.a
 
-  SOURCE[afalgtest]=afalgtest.c testutil.c
-  INCLUDE[afalgtest]=.. ../include
-  DEPEND[afalgtest]=../libcrypto
+  SOURCE[afalgtest]=afalgtest.c
+  INCLUDE[afalgtest]=../include ../apps/include
+  DEPEND[afalgtest]=../libcrypto libtestutil.a
 
-  SOURCE[d2i_test]=d2i_test.c testutil.c test_main_custom.c
-  INCLUDE[d2i_test]=.. ../include
-  DEPEND[d2i_test]=../libcrypto
+  SOURCE[d2i_test]=d2i_test.c
+  INCLUDE[d2i_test]=../include ../apps/include
+  DEPEND[d2i_test]=../libcrypto libtestutil.a
 
-  SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c test_main_custom.c
-  INCLUDE[ssl_test_ctx_test]=.. ../include
-  DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl
+  SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
+  INCLUDE[ssl_test_ctx_test]=../include ../apps/include
+  DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c test_main_custom.c
-  INCLUDE[ssl_test]=.. ../include
-  DEPEND[ssl_test]=../libcrypto ../libssl
+  SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
+  INCLUDE[ssl_test]=../include ../apps/include
+  DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[cipherlist_test]=cipherlist_test.c testutil.c test_main.c
-  INCLUDE[cipherlist_test]=.. ../include
-  DEPEND[cipherlist_test]=../libcrypto ../libssl
+  SOURCE[cipherlist_test]=cipherlist_test.c
+  INCLUDE[cipherlist_test]=../include ../apps/include
+  DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
 
-  INCLUDE[testutil.o]=..
   INCLUDE[ssl_test_ctx.o]=../include
-  INCLUDE[handshake_helper.o]=../include
+  INCLUDE[handshake_helper.o]=.. ../include
   INCLUDE[ssltestlib.o]=.. ../include
 
-  SOURCE[x509aux]=x509aux.c testutil.c test_main_custom.c
-  INCLUDE[x509aux]=.. ../include
-  DEPEND[x509aux]=../libcrypto
+  SOURCE[x509aux]=x509aux.c
+  INCLUDE[x509aux]=../include ../apps/include
+  DEPEND[x509aux]=../libcrypto libtestutil.a
+
+  SOURCE[asynciotest]=asynciotest.c ssltestlib.c
+  INCLUDE[asynciotest]=../include ../apps/include
+  DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[bio_callback_test]=bio_callback_test.c
+  INCLUDE[bio_callback_test]=../include ../apps/include
+  DEPEND[bio_callback_test]=../libcrypto libtestutil.a
+
+  SOURCE[bio_memleak_test]=bio_memleak_test.c
+  INCLUDE[bio_memleak_test]=../include ../apps/include
+  DEPEND[bio_memleak_test]=../libcrypto libtestutil.a
 
-  SOURCE[asynciotest]=asynciotest.c ssltestlib.c testutil.c test_main_custom.c
-  INCLUDE[asynciotest]=../include
-  DEPEND[asynciotest]=../libcrypto ../libssl
+  SOURCE[bioprinttest]=bioprinttest.c
+  INCLUDE[bioprinttest]=../include ../apps/include
+  DEPEND[bioprinttest]=../libcrypto libtestutil.a
 
-  SOURCE[bioprinttest]=bioprinttest.c testutil.c test_main_custom.c
-  INCLUDE[bioprinttest]=../ ../include
-  DEPEND[bioprinttest]=../libcrypto
+  SOURCE[sslapitest]=sslapitest.c ssltestlib.c
+  INCLUDE[sslapitest]=../include ../apps/include ..
+  DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
-  INCLUDE[sslapitest]=../include ..
-  DEPEND[sslapitest]=../libcrypto ../libssl
+  SOURCE[ocspapitest]=ocspapitest.c
+  INCLUDE[ocspapitest]=../include ../apps/include
+  DEPEND[ocspapitest]=../libcrypto libtestutil.a
 
-  SOURCE[dtlstest]=dtlstest.c ssltestlib.c testutil.c test_main_custom.c
-  INCLUDE[dtlstest]=../include .
-  DEPEND[dtlstest]=../libcrypto ../libssl
+  SOURCE[dtlstest]=dtlstest.c ssltestlib.c
+  INCLUDE[dtlstest]=../include ../apps/include
+  DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c testutil.c test_main_custom.c
-  INCLUDE[sslcorrupttest]=../include .
-  DEPEND[sslcorrupttest]=../libcrypto ../libssl
+  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
+  INCLUDE[sslcorrupttest]=../include ../apps/include
+  DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[bio_enc_test]=bio_enc_test.c
-  INCLUDE[bio_enc_test]=../include
-  DEPEND[bio_enc_test]=../libcrypto
+  INCLUDE[bio_enc_test]=../include ../apps/include
+  DEPEND[bio_enc_test]=../libcrypto libtestutil.a
 
-  SOURCE[pkey_meth_test]=pkey_meth_test.c testutil.c test_main.c
-  INCLUDE[pkey_meth_test]=../include
-  DEPEND[pkey_meth_test]=../libcrypto
+  SOURCE[pkey_meth_test]=pkey_meth_test.c
+  INCLUDE[pkey_meth_test]=../include ../apps/include
+  DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
 
-  SOURCE[x509_time_test]=x509_time_test.c testutil.c test_main.c
-  INCLUDE[x509_time_test]=.. ../include
-  DEPEND[x509_time_test]=../libcrypto
+  SOURCE[pkey_meth_kdf_test]=pkey_meth_kdf_test.c
+  INCLUDE[pkey_meth_kdf_test]=../include ../apps/include
+  DEPEND[pkey_meth_kdf_test]=../libcrypto libtestutil.a
 
-  SOURCE[recordlentest]=recordlentest.c ssltestlib.c testutil.c test_main_custom.c
-  INCLUDE[recordlentest]=../include .
-  DEPEND[recordlentest]=../libcrypto ../libssl
+  SOURCE[evp_kdf_test]=evp_kdf_test.c
+  INCLUDE[evp_kdf_test]=../include ../apps/include
+  DEPEND[evp_kdf_test]=../libcrypto libtestutil.a
+
+  SOURCE[x509_time_test]=x509_time_test.c
+  INCLUDE[x509_time_test]=../include ../apps/include
+  DEPEND[x509_time_test]=../libcrypto libtestutil.a
+
+  SOURCE[recordlentest]=recordlentest.c ssltestlib.c
+  INCLUDE[recordlentest]=../include ../apps/include
+  DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[drbgtest]=drbgtest.c
+  INCLUDE[drbgtest]=../include ../apps/include
+  DEPEND[drbgtest]=../libcrypto.a libtestutil.a
+
+  SOURCE[drbg_cavs_test]=drbg_cavs_test.c drbg_cavs_data_ctr.c \
+                         drbg_cavs_data_hash.c drbg_cavs_data_hmac.c
+
+  INCLUDE[drbg_cavs_test]=../include ../apps/include . ..
+  DEPEND[drbg_cavs_test]=../libcrypto libtestutil.a
+
+  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
+  INCLUDE[x509_dup_cert_test]=../include ../apps/include
+  DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
+
+  SOURCE[x509_check_cert_pkey_test]=x509_check_cert_pkey_test.c
+  INCLUDE[x509_check_cert_pkey_test]=../include ../apps/include
+  DEPEND[x509_check_cert_pkey_test]=../libcrypto libtestutil.a
+
+  SOURCE[pemtest]=pemtest.c
+  INCLUDE[pemtest]=../include ../apps/include
+  DEPEND[pemtest]=../libcrypto libtestutil.a
+
+  SOURCE[ssl_cert_table_internal_test]=ssl_cert_table_internal_test.c
+  INCLUDE[ssl_cert_table_internal_test]=.. ../include ../apps/include
+  DEPEND[ssl_cert_table_internal_test]=../libcrypto libtestutil.a
+
+  SOURCE[ciphername_test]=ciphername_test.c
+  INCLUDE[ciphername_test]=../include ../apps/include
+  DEPEND[ciphername_test]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[servername_test]=servername_test.c ssltestlib.c
+  INCLUDE[servername_test]=../include ../apps/include
+  DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a
+
+  IF[{- !$disabled{cms} -}]
+    PROGRAMS{noinst}=cmsapitest
+    SOURCE[cmsapitest]=cmsapitest.c
+    INCLUDE[cmsapitest]=../include ../apps/include
+    DEPEND[cmsapitest]=../libcrypto libtestutil.a
+  ENDIF
 
   IF[{- !$disabled{psk} -}]
-    PROGRAMS_NO_INST=dtls_mtu_test
+    PROGRAMS{noinst}=dtls_mtu_test
     SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
-    INCLUDE[dtls_mtu_test]=.. ../include
-    DEPEND[dtls_mtu_test]=../libcrypto ../libssl
+    INCLUDE[dtls_mtu_test]=.. ../include ../apps/include
+    DEPEND[dtls_mtu_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
   IF[{- !$disabled{shared} -}]
-    PROGRAMS_NO_INST=shlibloadtest
+    PROGRAMS{noinst}=shlibloadtest
     SOURCE[shlibloadtest]=shlibloadtest.c
-    INCLUDE[shlibloadtest]=../include
+    INCLUDE[shlibloadtest]=../include ../apps/include ../crypto/include
   ENDIF
 
   IF[{- $disabled{shared} -}]
-    PROGRAMS_NO_INST=cipher_overhead_test
-    SOURCE[cipher_overhead_test]=cipher_overhead_test.c testutil.c test_main.c
-    INCLUDE[cipher_overhead_test]=.. ../include
-    DEPEND[cipher_overhead_test]=../libcrypto ../libssl
+    PROGRAMS{noinst}=cipher_overhead_test
+    SOURCE[cipher_overhead_test]=cipher_overhead_test.c
+    INCLUDE[cipher_overhead_test]=.. ../include ../apps/include
+    DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
-  SOURCE[uitest]=uitest.c testutil.c test_main_custom.c \
-    ../apps/apps.c ../apps/opt.c {- $apps_extra -}
-  INCLUDE[uitest]=.. ../include
-  DEPEND[uitest]=../libcrypto ../libssl
+  SOURCE[uitest]=uitest.c ../apps/apps_ui.c
+  INCLUDE[uitest]=.. ../include ../apps/include
+  DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[cipherbytes_test]=cipherbytes_test.c
-  INCLUDE[cipherbytes_test]=.. ../include
-  DEPEND[cipherbytes_test]=../libcrypto ../libssl
+  INCLUDE[cipherbytes_test]=../include ../apps/include
+  DEPEND[cipherbytes_test]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[asn1_encode_test]=asn1_encode_test.c
+  INCLUDE[asn1_encode_test]=../include ../apps/include
+  DEPEND[asn1_encode_test]=../libcrypto libtestutil.a
+
+  SOURCE[asn1_decode_test]=asn1_decode_test.c
+  INCLUDE[asn1_decode_test]=../include ../apps/include
+  DEPEND[asn1_decode_test]=../libcrypto libtestutil.a
 
-  SOURCE[asn1_encode_test]=asn1_encode_test.c testutil.c test_main.c
-  INCLUDE[asn1_encode_test]=../include
-  DEPEND[asn1_encode_test]=../libcrypto
+  SOURCE[asn1_string_table_test]=asn1_string_table_test.c
+  INCLUDE[asn1_string_table_test]=../include ../apps/include
+  DEPEND[asn1_string_table_test]=../libcrypto libtestutil.a
+
+  SOURCE[time_offset_test]=time_offset_test.c
+  INCLUDE[time_offset_test]=../include ../apps/include
+  DEPEND[time_offset_test]=../libcrypto libtestutil.a
+
+  SOURCE[conf_include_test]=conf_include_test.c
+  INCLUDE[conf_include_test]=../include ../apps/include
+  DEPEND[conf_include_test]=../libcrypto libtestutil.a
 
   # Internal test programs.  These are essentially a collection of internal
   # test routines.  Some of them need to reach internal symbols that aren't
   # available through the shared library (at least on Linux, Solaris, Windows
   # and VMS, where the exported symbols are those listed in util/*.num), these
   # programs are forcibly linked with the static libraries, where all symbols
-  # are always available.  This excludes linking these programs natively on
-  # Windows when building shared libraries, since the static libraries share
-  # names with the DLL import libraries.
-  IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}]
-    PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \
-                     tls13encryptiontest wpackettest
+  # are always available.
+  IF[1]
+    PROGRAMS{noinst}=asn1_internal_test modes_internal_test x509_internal_test \
+                     tls13encryptiontest wpackettest ctype_internal_test \
+                     rdrand_sanitytest property_test
     IF[{- !$disabled{poly1305} -}]
-      PROGRAMS_NO_INST=poly1305_internal_test
+      PROGRAMS{noinst}=poly1305_internal_test
     ENDIF
     IF[{- !$disabled{chacha} -}]
-      PROGRAMS_NO_INST=chacha_internal_test
+      PROGRAMS{noinst}=chacha_internal_test
     ENDIF
     IF[{- !$disabled{siphash} -}]
-      PROGRAMS_NO_INST=siphash_internal_test
+      PROGRAMS{noinst}=siphash_internal_test
+    ENDIF
+    IF[{- !$disabled{sm2} -}]
+      PROGRAMS{noinst}=sm2_internal_test
     ENDIF
+    IF[{- !$disabled{sm4} -}]
+      PROGRAMS{noinst}=sm4_internal_test
+    ENDIF
+    IF[{- !$disabled{ec} -}]
+      PROGRAMS{noinst}=ec_internal_test curve448_internal_test
+    ENDIF
+
+    SOURCE[poly1305_internal_test]=poly1305_internal_test.c
+    INCLUDE[poly1305_internal_test]=.. ../include ../apps/include ../crypto/include
+    DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[chacha_internal_test]=chacha_internal_test.c
+    INCLUDE[chacha_internal_test]=.. ../include ../apps/include ../crypto/include
+    DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[asn1_internal_test]=asn1_internal_test.c
+    INCLUDE[asn1_internal_test]=.. ../include ../apps/include ../crypto/include
+    DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[modes_internal_test]=modes_internal_test.c
+    INCLUDE[modes_internal_test]=.. ../include ../apps/include
+    DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[poly1305_internal_test]=poly1305_internal_test.c testutil.c test_main_custom.c
-    INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
-    DEPEND[poly1305_internal_test]=../libcrypto.a
+    SOURCE[x509_internal_test]=x509_internal_test.c
+    INCLUDE[x509_internal_test]=.. ../include ../apps/include
+    DEPEND[x509_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[chacha_internal_test]=chacha_internal_test.c testutil.c test_main.c
-    INCLUDE[chacha_internal_test]=.. ../include ../crypto/include
-    DEPEND[chacha_internal_test]=../libcrypto.a
+    SOURCE[tls13encryptiontest]=tls13encryptiontest.c
+    INCLUDE[tls13encryptiontest]=.. ../include ../apps/include
+    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
 
-    SOURCE[asn1_internal_test]=asn1_internal_test.c testutil.c test_main.c
-    INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
-    DEPEND[asn1_internal_test]=../libcrypto.a
+    SOURCE[wpackettest]=wpackettest.c
+    INCLUDE[wpackettest]=../include ../apps/include
+    DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
 
-    SOURCE[modes_internal_test]=modes_internal_test.c testutil.c test_main_custom.c
-    INCLUDE[modes_internal_test]=.. ../include
-    DEPEND[modes_internal_test]=../libcrypto.a
+    SOURCE[property_test]=property_test.c
+    INCLUDE[property_test]=../include ../apps/include
+    DEPEND[property_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[x509_internal_test]=x509_internal_test.c testutil.c test_main.c
-    INCLUDE[x509_internal_test]=.. ../include
-    DEPEND[x509_internal_test]=../libcrypto.a
+    SOURCE[ctype_internal_test]=ctype_internal_test.c
+    INCLUDE[ctype_internal_test]=.. ../crypto/include ../include ../apps/include
+    DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c
-    INCLUDE[tls13encryptiontest]=.. ../include
-    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a
+    SOURCE[sparse_array_test]=sparse_array_test.c
+    INCLUDE[sparse_array_test]=../crypto/include ../include ../apps/include
+    DEPEND[sparse_array_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
-    INCLUDE[wpackettest]=../include
-    DEPEND[wpackettest]=../libcrypto ../libssl.a
+    SOURCE[siphash_internal_test]=siphash_internal_test.c
+    INCLUDE[siphash_internal_test]=.. ../include ../apps/include ../crypto/include
+    DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a
 
-    SOURCE[siphash_internal_test]=siphash_internal_test.c testutil.c test_main_custom.c
-    INCLUDE[siphash_internal_test]=.. ../include ../crypto/include
-    DEPEND[siphash_internal_test]=../libcrypto.a
+    SOURCE[sm2_internal_test]=sm2_internal_test.c
+    INCLUDE[sm2_internal_test]=../include ../apps/include ../crypto/include
+    DEPEND[sm2_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[sm4_internal_test]=sm4_internal_test.c
+    INCLUDE[sm4_internal_test]=.. ../include ../apps/include ../crypto/include
+    DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[ec_internal_test]=ec_internal_test.c
+    INCLUDE[ec_internal_test]=../include ../crypto/ec ../apps/include ../crypto/include
+    DEPEND[ec_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[curve448_internal_test]=curve448_internal_test.c
+    INCLUDE[curve448_internal_test]=.. ../include ../apps/include ../crypto/ec/curve448
+    DEPEND[curve448_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[rdrand_sanitytest]=rdrand_sanitytest.c
+    INCLUDE[rdrand_sanitytest]=../include ../apps/include
+    DEPEND[rdrand_sanitytest]=../libcrypto.a libtestutil.a
   ENDIF
 
   IF[{- !$disabled{mdc2} -}]
-    PROGRAMS_NO_INST=mdc2_internal_test
+    PROGRAMS{noinst}=mdc2_internal_test
   ENDIF
 
-  SOURCE[mdc2_internal_test]=mdc2_internal_test.c testutil.c test_main.c
-  INCLUDE[mdc2_internal_test]=.. ../include
-  DEPEND[mdc2_internal_test]=../libcrypto
+  SOURCE[mdc2_internal_test]=mdc2_internal_test.c
+  INCLUDE[mdc2_internal_test]=.. ../include ../apps/include
+  DEPEND[mdc2_internal_test]=../libcrypto libtestutil.a
+
+  PROGRAMS{noinst}=asn1_time_test
+  SOURCE[asn1_time_test]=asn1_time_test.c
+  INCLUDE[asn1_time_test]=../include ../apps/include
+  DEPEND[asn1_time_test]=../libcrypto libtestutil.a
 
   # We disable this test completely in a shared build because it deliberately
   # redefines some internal libssl symbols. This doesn't work in a non-shared
   # build
   IF[{- !$disabled{shared} -}]
-    PROGRAMS_NO_INST=tls13secretstest
-    SOURCE[tls13secretstest]=tls13secretstest.c testutil.c test_main.c
+    PROGRAMS{noinst}=tls13secretstest
+    SOURCE[tls13secretstest]=tls13secretstest.c
     SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../ssl/packet.c
-    INCLUDE[tls13secretstest]=.. ../include
-    DEPEND[tls13secretstest]=../libcrypto ../libssl
+    INCLUDE[tls13secretstest]=.. ../include ../apps/include
+    DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
   ENDIF
+
+  SOURCE[sslbuffertest]=sslbuffertest.c ssltestlib.c
+  INCLUDE[sslbuffertest]=../include ../apps/include
+  DEPEND[sslbuffertest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[sysdefaulttest]=sysdefaulttest.c
+  INCLUDE[sysdefaulttest]=../include ../apps/include
+  DEPEND[sysdefaulttest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[errtest]=errtest.c
+  INCLUDE[errtest]=../include ../apps/include
+  DEPEND[errtest]=../libcrypto libtestutil.a
+
+  SOURCE[gosttest]=gosttest.c ssltestlib.c
+  INCLUDE[gosttest]=../include ../apps/include ..
+  DEPEND[gosttest]=../libcrypto ../libssl libtestutil.a
+
+  PROGRAMS{noinst}=context_internal_test
+  SOURCE[context_internal_test]=context_internal_test.c
+  INCLUDE[context_internal_test]=.. ../include ../apps/include
+  DEPEND[context_internal_test]=../libcrypto.a libtestutil.a
 ENDIF
 
 {-
    use File::Spec::Functions;
    use File::Basename;
-   use if $^O ne "VMS", 'File::Glob' => qw/glob/;
+   use OpenSSL::Glob;
 
    my @nogo_headers = ( "asn1_mac.h",
+                        "opensslconf.h",
                         "__decc_include_prologue.h",
                         "__decc_include_epilogue.h" );
+   my @nogo_headers_re = ( qr/.*err\.h/ );
    my @headerfiles = glob catfile($sourcedir,
                                   updir(), "include", "openssl", "*.h");
 
@@ -418,13 +590,22 @@ ENDIF
        my $name = basename($headerfile, ".h");
        next if $disabled{$name};
        next if grep { $_ eq lc("$name.h") } @nogo_headers;
+       next if grep { lc("$name.h") =~ m/$_/i } @nogo_headers_re;
        $OUT .= <<"_____";
 
-  PROGRAMS_NO_INST=buildtest_$name
+  PROGRAMS{noinst}=buildtest_c_$name
+  SOURCE[buildtest_c_$name]=buildtest_$name.c
   GENERATE[buildtest_$name.c]=generate_buildtest.pl $name
-  SOURCE[buildtest_$name]=buildtest_$name.c
-  INCLUDE[buildtest_$name]=../include
-  DEPEND[buildtest_$name]=../libssl ../libcrypto
+  INCLUDE[buildtest_c_$name]=../include
+  DEPEND[buildtest_c_$name]=../libssl ../libcrypto
+_____
+       $OUT .= <<"_____" if $config{CXX};
+
+  PROGRAMS{noinst}=buildtest_cc_$name
+  SOURCE[buildtest_cc_$name]=buildtest_$name.cc
+  GENERATE[buildtest_$name.cc]=generate_buildtest.pl $name
+  INCLUDE[buildtest_cc_$name]=../include
+  DEPEND[buildtest_cc_$name]=../libssl ../libcrypto
 _____
    }
 -}