X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fbuild.info;h=882f2dae1d4cc4db59cc337e68f6cc8aa8491797;hp=46403ea08b363b6e21c77108012d665233805af7;hb=3434f40b6f0b4eb782931d8f1fe2893c58c1a692;hpb=97f1e97114822a04a7720b817a789cc9d2553e2b

diff --git a/test/build.info b/test/build.info
index 46403ea08b..882f2dae1d 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,3 +1,11 @@
+{-
+     use File::Spec::Functions;
+     sub rebase_files
+     {
+         my ($base, $files) = @_;
+         return join(" ", map { "$base/$_" } split(/\s+/, $files));
+     }
+-}
 IF[{- !$disabled{tests} -}]
   PROGRAMS_NO_INST=\
           aborttest \
@@ -11,12 +19,13 @@ IF[{- !$disabled{tests} -}]
           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 \
+          danetest p5_crpt2_test bad_dtls_test \
           constant_time_test verify_extra_test clienthellotest \
           packettest asynctest secmemtest srptest memleaktest \
           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
 
   SOURCE[aborttest]=aborttest.c
   INCLUDE[aborttest]=../include
@@ -26,7 +35,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[sanitytest]=../include
   DEPEND[sanitytest]=../libcrypto
 
-  SOURCE[bntest]=bntest.c
+  SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
   INCLUDE[bntest]=.. ../crypto/include ../include
   DEPEND[bntest]=../libcrypto
 
@@ -170,10 +179,6 @@ IF[{- !$disabled{tests} -}]
   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
@@ -218,7 +223,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[dtlsv1listentest]=.. ../include
   DEPEND[dtlsv1listentest]=../libssl
 
-  SOURCE[ct_test]=ct_test.c testutil.c
+  SOURCE[ct_test]=ct_test.c testutil.c test_main_custom.c
   INCLUDE[ct_test]=../crypto/include ../include
   DEPEND[ct_test]=../libcrypto
 
@@ -230,19 +235,19 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[afalgtest]=.. ../include
   DEPEND[afalgtest]=../libcrypto
 
-  SOURCE[d2i_test]=d2i_test.c testutil.c
+  SOURCE[d2i_test]=d2i_test.c testutil.c test_main_custom.c
   INCLUDE[d2i_test]=.. ../include
   DEPEND[d2i_test]=../libcrypto
 
-  SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c
+  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
 
-  SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c
+  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[cipherlist_test]=cipherlist_test.c testutil.c
+  SOURCE[cipherlist_test]=cipherlist_test.c testutil.c test_main.c
   INCLUDE[cipherlist_test]=.. ../include
   DEPEND[cipherlist_test]=../libcrypto ../libssl
 
@@ -263,18 +268,26 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[bioprinttest]=../include
   DEPEND[bioprinttest]=../libcrypto
 
-  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c
+  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
   INCLUDE[sslapitest]=../include
   DEPEND[sslapitest]=../libcrypto ../libssl
 
-  SOURCE[dtlstest]=dtlstest.c ssltestlib.c testutil.c
+  SOURCE[dtlstest]=dtlstest.c ssltestlib.c testutil.c test_main_custom.c
   INCLUDE[dtlstest]=../include .
   DEPEND[dtlstest]=../libcrypto ../libssl
 
+  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c testutil.c
+  INCLUDE[sslcorrupttest]=../include .
+  DEPEND[sslcorrupttest]=../libcrypto ../libssl
+
   SOURCE[bio_enc_test]=bio_enc_test.c
   INCLUDE[bio_enc_test]=../include
   DEPEND[bio_enc_test]=../libcrypto
 
+  SOURCE[pkey_meth_test]=pkey_meth_test.c testutil.c test_main.c
+  INCLUDE[pkey_meth_test]=../include
+  DEPEND[pkey_meth_test]=../libcrypto
+
   IF[{- !$disabled{psk} -}]
     PROGRAMS_NO_INST=dtls_mtu_test
     SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
@@ -290,7 +303,7 @@ IF[{- !$disabled{tests} -}]
 
   IF[{- $disabled{shared} -}]
     PROGRAMS_NO_INST=wpackettest cipher_overhead_test
-    SOURCE[wpackettest]=wpackettest.c testutil.c
+    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
     INCLUDE[wpackettest]=../include
     DEPEND[wpackettest]=../libcrypto ../libssl
 
@@ -300,84 +313,59 @@ IF[{- !$disabled{tests} -}]
   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[poly1305_internal_test]=poly1305_internal_test.c testutil.c
-  IF[{- !$disabled{shared} -}]
-    SOURCE[poly1305_internal_test]= ../crypto/poly1305/poly1305.c \
-        {- $target{poly1305_asm_src} ? "../crypto/poly1305/".$target{poly1305_asm_src} : "" -} \
-        {- $target{cpuid_asm_src} ? "../crypto/".$target{cpuid_asm_src} : "" -} \
-        ../crypto/cryptlib.c
+  # 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 forcebly 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
+    IF[{- !$disabled{poly1305} -}]
+      PROGRAMS_NO_INST=poly1305_internal_test
+    ENDIF
+
+    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[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[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[x509_internal_test]=x509_internal_test.c testutil.c test_main.c
+    INCLUDE[x509_internal_test]=.. ../include
+    DEPEND[x509_internal_test]=../libcrypto.a
+
+    SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c
+    INCLUDE[tls13encryptiontest]=.. ../include
+    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a
   ENDIF
-  INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
-  DEPEND[poly1305_internal_test]=../libcrypto
 
-  SOURCE[asn1_internal_test]=asn1_internal_test.c testutil.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
+  IF[{- !$disabled{mdc2} -}]
+    PROGRAMS_NO_INST=mdc2_internal_test
   ENDIF
-  INCLUDE[asn1_internal_test]=.. ../include ../crypto/include
-  DEPEND[asn1_internal_test]=../libcrypto
 
-  SOURCE[modes_internal_test]=modes_internal_test.c testutil.c
-  IF[{- !$disabled{shared} -}]
-    SOURCE[modes_internal_test]= {- $target{cpuid_asm_src}
-                                    ? "../crypto/".$target{cpuid_asm_src}
-                                    : "" -} \
-        ../crypto/cryptlib.c
-  ENDIF
-  INCLUDE[modes_internal_test]=.. ../include
-  DEPEND[modes_internal_test]=../libcrypto
+  SOURCE[mdc2_internal_test]=mdc2_internal_test.c testutil.c test_main.c
+  INCLUDE[mdc2_internal_test]=.. ../include
+  DEPEND[mdc2_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
+  # 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} -}]
-    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
+    PROGRAMS_NO_INST=tls13secretstest
+    SOURCE[tls13secretstest]=tls13secretstest.c testutil.c test_main.c
+    SOURCE[tls13secretstest]= ../ssl/tls13_enc.c ../ssl/packet.c
+    INCLUDE[tls13secretstest]=.. ../include
+    DEPEND[tls13secretstest]=../libcrypto ../libssl
   ENDIF
-  INCLUDE[x509_internal_test]=.. ../include
-  DEPEND[x509_internal_test]=../libcrypto
-
-  SOURCE[mdc2_internal_test]=mdc2_internal_test.c testutil.c
-  INCLUDE[mdc2_internal_test]=.. ../include
-  DEPEND[mdc2_internal_test]=../libcrypto
 ENDIF
 
 {-