X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fbuild.info;h=00ff4670f1f49fa425de62045b0d5a037384a561;hp=0ec31d9761cd5b8f96de718350e0f249c74649a4;hb=20ee2bf138323c6688b6e8d71d695cf2bd53f857;hpb=e364c3b24e38bd60d40487e0a532261348a9bb10

diff --git a/test/build.info b/test/build.info
index 0ec31d9761..00ff4670f1 100644
--- a/test/build.info
+++ b/test/build.info
@@ -5,26 +5,45 @@
          my ($base, $files) = @_;
          return join(" ", map { "$base/$_" } split(/\s+/, $files));
      }
+     ""
 -}
 IF[{- !$disabled{tests} -}]
+  LIBS_NO_INST=libtestutil.a
+  SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
+          testutil/driver.c testutil/tests.c testutil/cb.c \
+          {- rebase_files("../apps", $target{apps_aux_src}) -} \
+          testutil/test_main.c testutil/main.c
+  INCLUDE[libtestutil.a]=.. ../include
+  DEPEND[libtestutil.a]=../libcrypto
+
+  # Special hack for descrip.mms to include the MAIN object module
+  # explicitely.  This will only be done if there isn't a MAIN in the
+  # program's object modules already.
+  BEGINRAW[descrip.mms]
+INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
+  ENDRAW[descrip.mms]
+
   PROGRAMS_NO_INST=\
-          aborttest \
-          sanitytest bntest \
-          ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
-          md2test md4test md5test \
-          hmactest wp_test \
+          aborttest test_test \
+          sanitytest exdatatest bntest \
+          ectest ecdsatest gmdifftest pbelutest ideatest \
+          md2test \
+          hmactest \
           rc2test rc4test rc5test \
           destest sha1test sha256t sha512t \
-          mdc2test rmdtest \
+          mdc2test \
           randtest dhtest enginetest casttest \
           bftest ssltest_old dsatest exptest rsa_test \
           evp_test evp_extra_test igetest v3nametest v3ext \
-          danetest heartbeat_test p5_crpt2_test bad_dtls_test \
+          crltest danetest bad_dtls_test lhash_test \
           constant_time_test verify_extra_test clienthellotest \
-          packettest asynctest secmemtest srptest memleaktest \
+          packettest asynctest secmemtest srptest memleaktest stack_test \
           dtlsv1listentest ct_test threadstest afalgtest d2i_test \
           ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \
-          bioprinttest sslapitest dtlstest bio_enc_test
+          bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \
+          pkey_meth_test uitest cipherbytes_test asn1_encode_test \
+          x509_time_test x509_dup_cert_test recordlentest \
+          time_offset_test
 
   SOURCE[aborttest]=aborttest.c
   INCLUDE[aborttest]=../include
@@ -32,127 +51,115 @@ IF[{- !$disabled{tests} -}]
 
   SOURCE[sanitytest]=sanitytest.c
   INCLUDE[sanitytest]=../include
-  DEPEND[sanitytest]=../libcrypto
+  DEPEND[sanitytest]=../libcrypto libtestutil.a
+
+  SOURCE[test_test]=test_test.c
+  INCLUDE[test_test]=.. ../include
+  DEPEND[test_test]=../libcrypto libtestutil.a
+
+  SOURCE[exdatatest]=exdatatest.c
+  INCLUDE[exdatatest]=../include
+  DEPEND[exdatatest]=../libcrypto libtestutil.a
 
   SOURCE[bntest]=bntest.c
   INCLUDE[bntest]=.. ../crypto/include ../include
-  DEPEND[bntest]=../libcrypto
+  DEPEND[bntest]=../libcrypto libtestutil.a
 
   SOURCE[ectest]=ectest.c
-  INCLUDE[ectest]=../include
+  INCLUDE[ectest]=.. ../include
   DEPEND[ectest]=../libcrypto
 
   SOURCE[ecdsatest]=ecdsatest.c
   INCLUDE[ecdsatest]=../include
-  DEPEND[ecdsatest]=../libcrypto
-
-  SOURCE[ecdhtest]=ecdhtest.c
-  INCLUDE[ecdhtest]=../include
-  DEPEND[ecdhtest]=../libcrypto
+  DEPEND[ecdsatest]=../libcrypto libtestutil.a
 
   SOURCE[gmdifftest]=gmdifftest.c
   INCLUDE[gmdifftest]=../include
-  DEPEND[gmdifftest]=../libcrypto
+  DEPEND[gmdifftest]=../libcrypto libtestutil.a
 
   SOURCE[pbelutest]=pbelutest.c
   INCLUDE[pbelutest]=../include
-  DEPEND[pbelutest]=../libcrypto
+  DEPEND[pbelutest]=../libcrypto libtestutil.a
 
   SOURCE[ideatest]=ideatest.c
   INCLUDE[ideatest]=../include
-  DEPEND[ideatest]=../libcrypto
+  DEPEND[ideatest]=../libcrypto libtestutil.a
 
   SOURCE[md2test]=md2test.c
   INCLUDE[md2test]=../include
-  DEPEND[md2test]=../libcrypto
-
-  SOURCE[md4test]=md4test.c
-  INCLUDE[md4test]=../include
-  DEPEND[md4test]=../libcrypto
-
-  SOURCE[md5test]=md5test.c
-  INCLUDE[md5test]=../include
-  DEPEND[md5test]=../libcrypto
+  DEPEND[md2test]=../libcrypto libtestutil.a
 
   SOURCE[hmactest]=hmactest.c
   INCLUDE[hmactest]=../include
-  DEPEND[hmactest]=../libcrypto
-
-  SOURCE[wp_test]=wp_test.c
-  INCLUDE[wp_test]=../include
-  DEPEND[wp_test]=../libcrypto
+  DEPEND[hmactest]=../libcrypto libtestutil.a
 
   SOURCE[rc2test]=rc2test.c
   INCLUDE[rc2test]=../include
-  DEPEND[rc2test]=../libcrypto
+  DEPEND[rc2test]=../libcrypto libtestutil.a
 
   SOURCE[rc4test]=rc4test.c
   INCLUDE[rc4test]=../include
-  DEPEND[rc4test]=../libcrypto
+  DEPEND[rc4test]=../libcrypto libtestutil.a
 
   SOURCE[rc5test]=rc5test.c
   INCLUDE[rc5test]=../include
-  DEPEND[rc5test]=../libcrypto
+  DEPEND[rc5test]=../libcrypto libtestutil.a
 
   SOURCE[destest]=destest.c
   INCLUDE[destest]=../include
-  DEPEND[destest]=../libcrypto
+  DEPEND[destest]=../libcrypto libtestutil.a
 
   SOURCE[sha1test]=sha1test.c
   INCLUDE[sha1test]=../include
-  DEPEND[sha1test]=../libcrypto
+  DEPEND[sha1test]=../libcrypto libtestutil.a
 
   SOURCE[sha256t]=sha256t.c
   INCLUDE[sha256t]=../include
-  DEPEND[sha256t]=../libcrypto
+  DEPEND[sha256t]=../libcrypto libtestutil.a
 
   SOURCE[sha512t]=sha512t.c
   INCLUDE[sha512t]=../include
-  DEPEND[sha512t]=../libcrypto
+  DEPEND[sha512t]=../libcrypto libtestutil.a
 
   SOURCE[mdc2test]=mdc2test.c
   INCLUDE[mdc2test]=../include
-  DEPEND[mdc2test]=../libcrypto
-
-  SOURCE[rmdtest]=rmdtest.c
-  INCLUDE[rmdtest]=../include
-  DEPEND[rmdtest]=../libcrypto
+  DEPEND[mdc2test]=../libcrypto libtestutil.a
 
   SOURCE[randtest]=randtest.c
   INCLUDE[randtest]=../include
-  DEPEND[randtest]=../libcrypto
+  DEPEND[randtest]=../libcrypto libtestutil.a
 
   SOURCE[dhtest]=dhtest.c
-  INCLUDE[dhtest]=../include
-  DEPEND[dhtest]=../libcrypto
+  INCLUDE[dhtest]=.. ../include
+  DEPEND[dhtest]=../libcrypto libtestutil.a
 
   SOURCE[enginetest]=enginetest.c
   INCLUDE[enginetest]=../include
-  DEPEND[enginetest]=../libcrypto
+  DEPEND[enginetest]=../libcrypto libtestutil.a
 
   SOURCE[casttest]=casttest.c
-  INCLUDE[casttest]=../include
-  DEPEND[casttest]=../libcrypto
+  INCLUDE[casttest]=.. ../include
+  DEPEND[casttest]=../libcrypto libtestutil.a
 
   SOURCE[bftest]=bftest.c
   INCLUDE[bftest]=../include
-  DEPEND[bftest]=../libcrypto
+  DEPEND[bftest]=../libcrypto libtestutil.a
 
   SOURCE[ssltest_old]=ssltest_old.c
   INCLUDE[ssltest_old]=.. ../include
   DEPEND[ssltest_old]=../libcrypto ../libssl
 
   SOURCE[dsatest]=dsatest.c
-  INCLUDE[dsatest]=../include
-  DEPEND[dsatest]=../libcrypto
+  INCLUDE[dsatest]=.. ../include
+  DEPEND[dsatest]=../libcrypto libtestutil.a
 
   SOURCE[exptest]=exptest.c
   INCLUDE[exptest]=../include
-  DEPEND[exptest]=../libcrypto
+  DEPEND[exptest]=../libcrypto libtestutil.a
 
   SOURCE[rsa_test]=rsa_test.c
   INCLUDE[rsa_test]=.. ../include
-  DEPEND[rsa_test]=../libcrypto
+  DEPEND[rsa_test]=../libcrypto libtestutil.a
 
   SOURCE[evp_test]=evp_test.c
   INCLUDE[evp_test]=../include
@@ -160,51 +167,47 @@ IF[{- !$disabled{tests} -}]
 
   SOURCE[evp_extra_test]=evp_extra_test.c
   INCLUDE[evp_extra_test]=../include
-  DEPEND[evp_extra_test]=../libcrypto
+  DEPEND[evp_extra_test]=../libcrypto libtestutil.a
 
   SOURCE[igetest]=igetest.c
   INCLUDE[igetest]=.. ../include
   DEPEND[igetest]=../libcrypto
 
   SOURCE[v3nametest]=v3nametest.c
-  INCLUDE[v3nametest]=../include
-  DEPEND[v3nametest]=../libcrypto
+  INCLUDE[v3nametest]=.. ../include
+  DEPEND[v3nametest]=../libcrypto libtestutil.a
+
+  SOURCE[crltest]=crltest.c
+  INCLUDE[crltest]=../include
+  DEPEND[crltest]=../libcrypto libtestutil.a
 
   SOURCE[v3ext]=v3ext.c
   INCLUDE[v3ext]=../include
-  DEPEND[v3ext]=../libcrypto
+  DEPEND[v3ext]=../libcrypto libtestutil.a
 
   SOURCE[danetest]=danetest.c
   INCLUDE[danetest]=../include
   DEPEND[danetest]=../libcrypto ../libssl
 
-  SOURCE[heartbeat_test]=heartbeat_test.c testutil.c
-  INCLUDE[heartbeat_test]=.. ../include
-  DEPEND[heartbeat_test]=../libcrypto ../libssl
-
-  SOURCE[p5_crpt2_test]=p5_crpt2_test.c
-  INCLUDE[p5_crpt2_test]=../include
-  DEPEND[p5_crpt2_test]=../libcrypto
-
   SOURCE[constant_time_test]=constant_time_test.c
   INCLUDE[constant_time_test]=.. ../include
-  DEPEND[constant_time_test]=../libcrypto
+  DEPEND[constant_time_test]=../libcrypto libtestutil.a
 
   SOURCE[verify_extra_test]=verify_extra_test.c
   INCLUDE[verify_extra_test]=../include
-  DEPEND[verify_extra_test]=../libcrypto
+  DEPEND[verify_extra_test]=../libcrypto libtestutil.a
 
   SOURCE[clienthellotest]=clienthellotest.c
   INCLUDE[clienthellotest]=../include
-  DEPEND[clienthellotest]=../libcrypto ../libssl
+  DEPEND[clienthellotest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[bad_dtls_test]=bad_dtls_test.c
   INCLUDE[bad_dtls_test]=../include
-  DEPEND[bad_dtls_test]=../libcrypto ../libssl
+  DEPEND[bad_dtls_test]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[packettest]=packettest.c
   INCLUDE[packettest]=../include
-  DEPEND[packettest]=../libcrypto
+  DEPEND[packettest]=../libcrypto libtestutil.a
 
   SOURCE[asynctest]=asynctest.c
   INCLUDE[asynctest]=.. ../include
@@ -212,82 +215,110 @@ IF[{- !$disabled{tests} -}]
 
   SOURCE[secmemtest]=secmemtest.c
   INCLUDE[secmemtest]=../include
-  DEPEND[secmemtest]=../libcrypto
+  DEPEND[secmemtest]=../libcrypto libtestutil.a
 
   SOURCE[srptest]=srptest.c
   INCLUDE[srptest]=../include
-  DEPEND[srptest]=../libcrypto
+  DEPEND[srptest]=../libcrypto libtestutil.a
 
   SOURCE[memleaktest]=memleaktest.c
   INCLUDE[memleaktest]=../include
-  DEPEND[memleaktest]=../libcrypto
+  DEPEND[memleaktest]=../libcrypto libtestutil.a
+
+  SOURCE[stack_test]=stack_test.c
+  INCLUDE[stack_test]=.. ../include
+  DEPEND[stack_test]=../libcrypto libtestutil.a
+
+  SOURCE[lhash_test]=lhash_test.c
+  INCLUDE[lhash_test]=.. ../include
+  DEPEND[lhash_test]=../libcrypto libtestutil.a
 
   SOURCE[dtlsv1listentest]=dtlsv1listentest.c
   INCLUDE[dtlsv1listentest]=.. ../include
-  DEPEND[dtlsv1listentest]=../libssl
+  DEPEND[dtlsv1listentest]=../libssl libtestutil.a
 
-  SOURCE[ct_test]=ct_test.c testutil.c test_main_custom.c
+  SOURCE[ct_test]=ct_test.c
   INCLUDE[ct_test]=../crypto/include ../include
-  DEPEND[ct_test]=../libcrypto
+  DEPEND[ct_test]=../libcrypto libtestutil.a
 
   SOURCE[threadstest]=threadstest.c
   INCLUDE[threadstest]=.. ../include
-  DEPEND[threadstest]=../libcrypto
+  DEPEND[threadstest]=../libcrypto libtestutil.a
 
   SOURCE[afalgtest]=afalgtest.c
   INCLUDE[afalgtest]=.. ../include
-  DEPEND[afalgtest]=../libcrypto
+  DEPEND[afalgtest]=../libcrypto libtestutil.a
 
-  SOURCE[d2i_test]=d2i_test.c testutil.c test_main_custom.c
+  SOURCE[d2i_test]=d2i_test.c
   INCLUDE[d2i_test]=.. ../include
-  DEPEND[d2i_test]=../libcrypto
+  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
+  SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c
   INCLUDE[ssl_test_ctx_test]=.. ../include
-  DEPEND[ssl_test_ctx_test]=../libcrypto
+  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
+  SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c handshake_helper.c
   INCLUDE[ssl_test]=.. ../include
-  DEPEND[ssl_test]=../libcrypto ../libssl
+  DEPEND[ssl_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[cipherlist_test]=cipherlist_test.c testutil.c test_main.c
+  SOURCE[cipherlist_test]=cipherlist_test.c
   INCLUDE[cipherlist_test]=.. ../include
-  DEPEND[cipherlist_test]=../libcrypto ../libssl
+  DEPEND[cipherlist_test]=../libcrypto ../libssl libtestutil.a
 
   INCLUDE[testutil.o]=..
   INCLUDE[ssl_test_ctx.o]=../include
   INCLUDE[handshake_helper.o]=../include
-  INCLUDE[ssltestlib.o]=../include
+  INCLUDE[ssltestlib.o]=.. ../include
 
   SOURCE[x509aux]=x509aux.c
-  INCLUDE[x509aux]=../include
-  DEPEND[x509aux]=../libcrypto
+  INCLUDE[x509aux]=.. ../include
+  DEPEND[x509aux]=../libcrypto libtestutil.a
 
   SOURCE[asynciotest]=asynciotest.c ssltestlib.c
   INCLUDE[asynciotest]=../include
-  DEPEND[asynciotest]=../libcrypto ../libssl
+  DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
 
   SOURCE[bioprinttest]=bioprinttest.c
-  INCLUDE[bioprinttest]=../include
-  DEPEND[bioprinttest]=../libcrypto
+  INCLUDE[bioprinttest]=../ ../include
+  DEPEND[bioprinttest]=../libcrypto libtestutil.a
 
-  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
-  INCLUDE[sslapitest]=../include
-  DEPEND[sslapitest]=../libcrypto ../libssl
+  SOURCE[sslapitest]=sslapitest.c ssltestlib.c
+  INCLUDE[sslapitest]=../include ..
+  DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[dtlstest]=dtlstest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[dtlstest]=dtlstest.c ssltestlib.c
   INCLUDE[dtlstest]=../include .
-  DEPEND[dtlstest]=../libcrypto ../libssl
+  DEPEND[dtlstest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
+  INCLUDE[sslcorrupttest]=../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
+  DEPEND[bio_enc_test]=../libcrypto libtestutil.a
+
+  SOURCE[pkey_meth_test]=pkey_meth_test.c
+  INCLUDE[pkey_meth_test]=../include
+  DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
+
+  SOURCE[x509_time_test]=x509_time_test.c
+  INCLUDE[x509_time_test]=.. ../include
+  DEPEND[x509_time_test]=../libcrypto libtestutil.a
+
+  SOURCE[recordlentest]=recordlentest.c ssltestlib.c
+  INCLUDE[recordlentest]=../include .
+  DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
+
+  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
+  INCLUDE[x509_dup_cert_test]=../include
+  DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
 
   IF[{- !$disabled{psk} -}]
     PROGRAMS_NO_INST=dtls_mtu_test
     SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
     INCLUDE[dtls_mtu_test]=.. ../include
-    DEPEND[dtls_mtu_test]=../libcrypto ../libssl
+    DEPEND[dtls_mtu_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
   IF[{- !$disabled{shared} -}]
@@ -297,104 +328,99 @@ IF[{- !$disabled{tests} -}]
   ENDIF
 
   IF[{- $disabled{shared} -}]
-    PROGRAMS_NO_INST=wpackettest cipher_overhead_test
-    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
-    INCLUDE[wpackettest]=../include
-    DEPEND[wpackettest]=../libcrypto ../libssl
-
+    PROGRAMS_NO_INST=cipher_overhead_test
     SOURCE[cipher_overhead_test]=cipher_overhead_test.c
     INCLUDE[cipher_overhead_test]=.. ../include
-    DEPEND[cipher_overhead_test]=../libcrypto ../libssl
+    DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a
   ENDIF
 
-  # Internal test programs.  These are essentially a collection of internal
-  # test routines.  Because they sometimes 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 may be built on files directly picked from inside crypto/
-  # or ssl/, to test using symbols that exist in those specific files.  These
-  # programs will also be linked with libcrypto / libssl, so we don't pick
-  # out more specific files than necessary.
-  # This might mean we have multiply defined symbols, but since linking is
-  # ordered with object files first and libraries after, the symbols from the
-  # object files will be chosen before those in the libraries.  This is handled
-  # properly by all linkers.
-  # Note that when building with static libraries, none of those extra files
-  # are needed, since all symbols are available anyway, regardless of what's
-  # listed in util/*.num.
-  PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test
-  IF[{- !$disabled{mdc2} -}]
-    PROGRAMS_NO_INST=mdc2_internal_test
-  ENDIF
-  IF[{- !$disabled{poly1305} -}]
-    PROGRAMS_NO_INST=poly1305_internal_test
-  ENDIF
+  SOURCE[uitest]=uitest.c ../apps/apps.c ../apps/opt.c
+  INCLUDE[uitest]=.. ../include
+  DEPEND[uitest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[poly1305_internal_test]=poly1305_internal_test.c testutil.c test_main_custom.c
-  IF[{- !$disabled{shared} -}]
-    SOURCE[poly1305_internal_test]= ../crypto/poly1305/poly1305.c \
-        {- rebase_files("../crypto/poly1305", $target{poly1305_asm_src}) -} \
-        {- rebase_files("../crypto", $target{cpuid_asm_src}) -} \
-        ../crypto/cryptlib.c
-  ENDIF
-  INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
-  DEPEND[poly1305_internal_test]=../libcrypto
+  SOURCE[cipherbytes_test]=cipherbytes_test.c
+  INCLUDE[cipherbytes_test]=.. ../include
+  DEPEND[cipherbytes_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[asn1_internal_test]=asn1_internal_test.c testutil.c test_main.c
-  IF[{- !$disabled{shared} -}]
-    SOURCE[asn1_internal_test]= ../crypto/asn1/a_strnid.c \
-        ../crypto/rsa/rsa_ameth.c ../crypto/dsa/dsa_ameth.c \
-        ../crypto/dh/dh_ameth.c ../crypto/ec/ec_ameth.c \
-        ../crypto/hmac/hm_ameth.c ../crypto/cmac/cm_ameth.c \
-        ../crypto/ec/ecx_meth.c ../crypto/ec/curve25519.c
-  ENDIF
-  INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
-  DEPEND[asn1_internal_test]=../libcrypto
+  SOURCE[asn1_encode_test]=asn1_encode_test.c
+  INCLUDE[asn1_encode_test]=../include
+  DEPEND[asn1_encode_test]=../libcrypto libtestutil.a
 
-  SOURCE[modes_internal_test]=modes_internal_test.c testutil.c test_main_custom.c
-  IF[{- !$disabled{shared} -}]
-    SOURCE[modes_internal_test]= \
-        {- rebase_files("../crypto", $target{cpuid_asm_src}); -} \
-        ../crypto/cryptlib.c
+  SOURCE[time_offset_test]=time_offset_test.c
+  INCLUDE[time_offset_test]=.. ../include
+  DEPEND[time_offset_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
+    IF[{- !$disabled{poly1305} -}]
+      PROGRAMS_NO_INST=poly1305_internal_test
+    ENDIF
+    IF[{- !$disabled{chacha} -}]
+      PROGRAMS_NO_INST=chacha_internal_test
+    ENDIF
+    IF[{- !$disabled{siphash} -}]
+      PROGRAMS_NO_INST=siphash_internal_test
+    ENDIF
+
+    SOURCE[poly1305_internal_test]=poly1305_internal_test.c
+    INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
+    DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[chacha_internal_test]=chacha_internal_test.c
+    INCLUDE[chacha_internal_test]=.. ../include ../crypto/include
+    DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[asn1_internal_test]=asn1_internal_test.c
+    INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
+    DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[modes_internal_test]=modes_internal_test.c
+    INCLUDE[modes_internal_test]=.. ../include
+    DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[x509_internal_test]=x509_internal_test.c
+    INCLUDE[x509_internal_test]=.. ../include
+    DEPEND[x509_internal_test]=../libcrypto.a libtestutil.a
+
+    SOURCE[tls13encryptiontest]=tls13encryptiontest.c
+    INCLUDE[tls13encryptiontest]=.. ../include
+    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a libtestutil.a
+
+    SOURCE[wpackettest]=wpackettest.c
+    INCLUDE[wpackettest]=../include
+    DEPEND[wpackettest]=../libcrypto ../libssl.a libtestutil.a
+
+    SOURCE[siphash_internal_test]=siphash_internal_test.c
+    INCLUDE[siphash_internal_test]=.. ../include ../crypto/include
+    DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a
   ENDIF
-  INCLUDE[modes_internal_test]=.. ../include
-  DEPEND[modes_internal_test]=../libcrypto
 
-  # The reason for the huge amount of directly included x509v3 files
-  # is that a table that is checked by x509_internal_test refers to
-  # structures that are spread all over those files.
-  SOURCE[x509_internal_test]=x509_internal_test.c testutil.c test_main.c
-  IF[{- !$disabled{shared} -}]
-    SOURCE[x509_internal_test]= ../crypto/x509v3/v3_bitst.c \
-        ../crypto/x509v3/v3_ia5.c ../crypto/x509v3/v3_skey.c \
-        ../crypto/x509v3/v3_pku.c ../crypto/x509v3/v3_alt.c \
-        ../crypto/x509v3/v3_bcons.c ../crypto/x509v3/v3_int.c \
-        ../crypto/x509v3/v3_cpols.c ../crypto/x509v3/v3_akey.c \
-        ../crypto/x509v3/v3_crld.c ../crypto/x509v3/v3_utl.c \
-        ../crypto/x509v3/v3_extku.c ../crypto/x509v3/v3_enum.c \
-        ../crypto/x509v3/v3_sxnet.c ../crypto/x509v3/v3_info.c \
-        ../crypto/x509v3/v3_addr.c ../crypto/x509v3/v3_asid.c \
-        ../crypto/x509v3/v3_pcons.c ../crypto/x509v3/v3_pmaps.c \
-        ../crypto/x509v3/v3_pci.c ../crypto/x509v3/v3_ncons.c \
-        ../crypto/x509v3/v3_tlsf.c ../crypto/ocsp/v3_ocsp.c \
-        ../crypto/ct/ct_x509v3.c ../crypto/asn1/a_strex.c
+  IF[{- !$disabled{mdc2} -}]
+    PROGRAMS_NO_INST=mdc2_internal_test
   ENDIF
-  INCLUDE[x509_internal_test]=.. ../include
-  DEPEND[x509_internal_test]=../libcrypto
 
-  SOURCE[mdc2_internal_test]=mdc2_internal_test.c testutil.c test_main.c
+  SOURCE[mdc2_internal_test]=mdc2_internal_test.c
   INCLUDE[mdc2_internal_test]=.. ../include
-  DEPEND[mdc2_internal_test]=../libcrypto
+  DEPEND[mdc2_internal_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
+    SOURCE[tls13secretstest]=tls13secretstest.c
     SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../ssl/packet.c
     INCLUDE[tls13secretstest]=.. ../include
-    DEPEND[tls13secretstest]=../libcrypto ../libssl
+    DEPEND[tls13secretstest]=../libcrypto ../libssl libtestutil.a
   ENDIF
 ENDIF