X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fbuild.info;h=4525362a0818d0f8a435426c352f85ca2e72a249;hp=6bdeb8523bccaee32d6ccdd62c7344e65e3c16c6;hb=623d1056de175ee5cd17839617fbfabac72cba91;hpb=2f0ca54c32299638e5a1d7577112a7fc07774f00

diff --git a/test/build.info b/test/build.info
index 6bdeb8523b..4525362a08 100644
--- a/test/build.info
+++ b/test/build.info
@@ -11,9 +11,9 @@
 -}
 IF[{- !$disabled{tests} -}]
   PROGRAMS_NO_INST=\
-          aborttest \
+          aborttest test_test \
           sanitytest exdatatest bntest \
-          ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
+          ectest ecdsatest gmdifftest pbelutest ideatest \
           md2test \
           hmactest \
           rc2test rc4test rc5test \
@@ -22,23 +22,28 @@ IF[{- !$disabled{tests} -}]
           randtest dhtest enginetest casttest \
           bftest ssltest_old dsatest exptest rsa_test \
           evp_test evp_extra_test igetest v3nametest v3ext \
-          crltest danetest 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 sslcorrupttest bio_enc_test \
-          pkey_meth_test uitest cipherbytes_test x509_time_test
+          pkey_meth_test uitest cipherbytes_test asn1_encode_test \
+          x509_time_test recordlentest
 
   SOURCE[aborttest]=aborttest.c
   INCLUDE[aborttest]=../include
   DEPEND[aborttest]=../libcrypto
 
-  SOURCE[sanitytest]=sanitytest.c
+  SOURCE[sanitytest]=sanitytest.c testutil.c test_main.c
   INCLUDE[sanitytest]=../include
   DEPEND[sanitytest]=../libcrypto
 
-  SOURCE[exdatatest]=exdatatest.c
+  SOURCE[test_test]=test_test.c testutil.c test_main.c
+  INCLUDE[test_test]=.. ../include
+  DEPEND[test_test]=../libcrypto
+
+  SOURCE[exdatatest]=exdatatest.c testutil.c test_main.c
   INCLUDE[exdatatest]=../include
   DEPEND[exdatatest]=../libcrypto
 
@@ -50,83 +55,79 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[ectest]=.. ../include
   DEPEND[ectest]=../libcrypto
 
-  SOURCE[ecdsatest]=ecdsatest.c
+  SOURCE[ecdsatest]=ecdsatest.c testutil.c test_main.c
   INCLUDE[ecdsatest]=../include
   DEPEND[ecdsatest]=../libcrypto
 
-  SOURCE[ecdhtest]=ecdhtest.c
-  INCLUDE[ecdhtest]=../include
-  DEPEND[ecdhtest]=../libcrypto
-
-  SOURCE[gmdifftest]=gmdifftest.c
+  SOURCE[gmdifftest]=gmdifftest.c testutil.c test_main.c
   INCLUDE[gmdifftest]=../include
   DEPEND[gmdifftest]=../libcrypto
 
-  SOURCE[pbelutest]=pbelutest.c
+  SOURCE[pbelutest]=pbelutest.c testutil.c test_main.c
   INCLUDE[pbelutest]=../include
   DEPEND[pbelutest]=../libcrypto
 
-  SOURCE[ideatest]=ideatest.c
+  SOURCE[ideatest]=ideatest.c testutil.c test_main.c
   INCLUDE[ideatest]=../include
   DEPEND[ideatest]=../libcrypto
 
-  SOURCE[md2test]=md2test.c
+  SOURCE[md2test]=md2test.c testutil.c test_main.c
   INCLUDE[md2test]=../include
   DEPEND[md2test]=../libcrypto
 
-  SOURCE[hmactest]=hmactest.c
+  SOURCE[hmactest]=hmactest.c testutil.c test_main.c
   INCLUDE[hmactest]=../include
   DEPEND[hmactest]=../libcrypto
 
-  SOURCE[rc2test]=rc2test.c
+  SOURCE[rc2test]=rc2test.c testutil.c test_main.c
   INCLUDE[rc2test]=../include
   DEPEND[rc2test]=../libcrypto
 
-  SOURCE[rc4test]=rc4test.c
+  SOURCE[rc4test]=rc4test.c testutil.c test_main.c
   INCLUDE[rc4test]=../include
   DEPEND[rc4test]=../libcrypto
 
-  SOURCE[rc5test]=rc5test.c
+  SOURCE[rc5test]=rc5test.c testutil.c test_main.c
   INCLUDE[rc5test]=../include
   DEPEND[rc5test]=../libcrypto
 
-  SOURCE[destest]=destest.c
+  SOURCE[destest]=destest.c testutil.c test_main.c
   INCLUDE[destest]=../include
   DEPEND[destest]=../libcrypto
 
-  SOURCE[sha1test]=sha1test.c
+  SOURCE[sha1test]=sha1test.c testutil.c test_main.c
   INCLUDE[sha1test]=../include
   DEPEND[sha1test]=../libcrypto
 
-  SOURCE[sha256t]=sha256t.c
+  SOURCE[sha256t]=sha256t.c testutil.c test_main.c
   INCLUDE[sha256t]=../include
   DEPEND[sha256t]=../libcrypto
 
-  SOURCE[sha512t]=sha512t.c
+  SOURCE[sha512t]=sha512t.c testutil.c test_main.c
   INCLUDE[sha512t]=../include
   DEPEND[sha512t]=../libcrypto
 
-  SOURCE[mdc2test]=mdc2test.c
+  SOURCE[mdc2test]=mdc2test.c testutil.c test_main.c
   INCLUDE[mdc2test]=../include
   DEPEND[mdc2test]=../libcrypto
 
-  SOURCE[randtest]=randtest.c
+  SOURCE[randtest]=randtest.c testutil.c test_main.c
   INCLUDE[randtest]=../include
   DEPEND[randtest]=../libcrypto
 
-  SOURCE[dhtest]=dhtest.c
-  INCLUDE[dhtest]=../include
+  SOURCE[dhtest]=dhtest.c testutil.c test_main.c
+  INCLUDE[dhtest]=.. ../include
   DEPEND[dhtest]=../libcrypto
 
-  SOURCE[enginetest]=enginetest.c
+  SOURCE[enginetest]=enginetest.c testutil.c test_main.c
   INCLUDE[enginetest]=../include
   DEPEND[enginetest]=../libcrypto
 
-  SOURCE[casttest]=casttest.c
-  INCLUDE[casttest]=../include
+  SOURCE[casttest]=casttest.c testutil.c test_main.c
+  INCLUDE[casttest]=.. ../include
   DEPEND[casttest]=../libcrypto
 
-  SOURCE[bftest]=bftest.c
+  SOURCE[bftest]=bftest.c testutil.c test_main_custom.c
   INCLUDE[bftest]=../include
   DEPEND[bftest]=../libcrypto
 
@@ -134,15 +135,15 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[ssltest_old]=.. ../include
   DEPEND[ssltest_old]=../libcrypto ../libssl
 
-  SOURCE[dsatest]=dsatest.c
-  INCLUDE[dsatest]=../include
+  SOURCE[dsatest]=dsatest.c testutil.c test_main.c
+  INCLUDE[dsatest]=.. ../include
   DEPEND[dsatest]=../libcrypto
 
   SOURCE[exptest]=exptest.c
   INCLUDE[exptest]=../include
   DEPEND[exptest]=../libcrypto
 
-  SOURCE[rsa_test]=rsa_test.c
+  SOURCE[rsa_test]=rsa_test.c testutil.c test_main.c
   INCLUDE[rsa_test]=.. ../include
   DEPEND[rsa_test]=../libcrypto
 
@@ -150,7 +151,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[evp_test]=../include
   DEPEND[evp_test]=../libcrypto
 
-  SOURCE[evp_extra_test]=evp_extra_test.c
+  SOURCE[evp_extra_test]=evp_extra_test.c testutil.c test_main.c
   INCLUDE[evp_extra_test]=../include
   DEPEND[evp_extra_test]=../libcrypto
 
@@ -158,15 +159,15 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[igetest]=.. ../include
   DEPEND[igetest]=../libcrypto
 
-  SOURCE[v3nametest]=v3nametest.c
-  INCLUDE[v3nametest]=../include
+  SOURCE[v3nametest]=v3nametest.c testutil.c test_main.c
+  INCLUDE[v3nametest]=.. ../include
   DEPEND[v3nametest]=../libcrypto
 
   SOURCE[crltest]=crltest.c testutil.c test_main.c
   INCLUDE[crltest]=../include
   DEPEND[crltest]=../libcrypto
 
-  SOURCE[v3ext]=v3ext.c
+  SOURCE[v3ext]=v3ext.c testutil.c test_main_custom.c
   INCLUDE[v3ext]=../include
   DEPEND[v3ext]=../libcrypto
 
@@ -174,23 +175,23 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[danetest]=../include
   DEPEND[danetest]=../libcrypto ../libssl
 
-  SOURCE[constant_time_test]=constant_time_test.c
+  SOURCE[constant_time_test]=constant_time_test.c testutil.c test_main.c
   INCLUDE[constant_time_test]=.. ../include
   DEPEND[constant_time_test]=../libcrypto
 
-  SOURCE[verify_extra_test]=verify_extra_test.c
+  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[clienthellotest]=clienthellotest.c
+  SOURCE[clienthellotest]=clienthellotest.c testutil.c test_main_custom.c
   INCLUDE[clienthellotest]=../include
   DEPEND[clienthellotest]=../libcrypto ../libssl
 
-  SOURCE[bad_dtls_test]=bad_dtls_test.c
+  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[packettest]=packettest.c
+  SOURCE[packettest]=packettest.c testutil.c test_main.c
   INCLUDE[packettest]=../include
   DEPEND[packettest]=../libcrypto
 
@@ -198,18 +199,26 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[asynctest]=.. ../include
   DEPEND[asynctest]=../libcrypto
 
-  SOURCE[secmemtest]=secmemtest.c
+  SOURCE[secmemtest]=secmemtest.c testutil.c test_main.c
   INCLUDE[secmemtest]=../include
   DEPEND[secmemtest]=../libcrypto
 
-  SOURCE[srptest]=srptest.c
+  SOURCE[srptest]=srptest.c testutil.c test_main.c
   INCLUDE[srptest]=../include
   DEPEND[srptest]=../libcrypto
 
-  SOURCE[memleaktest]=memleaktest.c
+  SOURCE[memleaktest]=memleaktest.c testutil.c
   INCLUDE[memleaktest]=../include
   DEPEND[memleaktest]=../libcrypto
 
+  SOURCE[stack_test]=stack_test.c testutil.c test_main.c
+  INCLUDE[stack_test]=.. ../include
+  DEPEND[stack_test]=../libcrypto
+
+  SOURCE[lhash_test]=lhash_test.c testutil.c test_main.c
+  INCLUDE[lhash_test]=.. ../include
+  DEPEND[lhash_test]=../libcrypto
+
   SOURCE[dtlsv1listentest]=dtlsv1listentest.c
   INCLUDE[dtlsv1listentest]=.. ../include
   DEPEND[dtlsv1listentest]=../libssl
@@ -218,11 +227,11 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[ct_test]=../crypto/include ../include
   DEPEND[ct_test]=../libcrypto
 
-  SOURCE[threadstest]=threadstest.c
+  SOURCE[threadstest]=threadstest.c testutil.c test_main.c
   INCLUDE[threadstest]=.. ../include
   DEPEND[threadstest]=../libcrypto
 
-  SOURCE[afalgtest]=afalgtest.c
+  SOURCE[afalgtest]=afalgtest.c testutil.c
   INCLUDE[afalgtest]=.. ../include
   DEPEND[afalgtest]=../libcrypto
 
@@ -232,7 +241,7 @@ IF[{- !$disabled{tests} -}]
 
   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
+  DEPEND[ssl_test_ctx_test]=../libcrypto ../libssl
 
   SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c test_main_custom.c
   INCLUDE[ssl_test]=.. ../include
@@ -245,18 +254,18 @@ IF[{- !$disabled{tests} -}]
   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
+  SOURCE[x509aux]=x509aux.c testutil.c test_main_custom.c
+  INCLUDE[x509aux]=.. ../include
   DEPEND[x509aux]=../libcrypto
 
-  SOURCE[asynciotest]=asynciotest.c ssltestlib.c
+  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
+  SOURCE[bioprinttest]=bioprinttest.c testutil.c test_main_custom.c
+  INCLUDE[bioprinttest]=../ ../include
   DEPEND[bioprinttest]=../libcrypto
 
   SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
@@ -267,7 +276,7 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[dtlstest]=../include .
   DEPEND[dtlstest]=../libcrypto ../libssl
 
-  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c testutil.c
+  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c testutil.c test_main_custom.c
   INCLUDE[sslcorrupttest]=../include .
   DEPEND[sslcorrupttest]=../libcrypto ../libssl
 
@@ -283,6 +292,10 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[x509_time_test]=.. ../include
   DEPEND[x509_time_test]=../libcrypto
 
+  SOURCE[recordlentest]=recordlentest.c ssltestlib.c testutil.c test_main_custom.c
+  INCLUDE[recordlentest]=../include .
+  DEPEND[recordlentest]=../libcrypto ../libssl
+
   IF[{- !$disabled{psk} -}]
     PROGRAMS_NO_INST=dtls_mtu_test
     SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c
@@ -298,7 +311,7 @@ IF[{- !$disabled{tests} -}]
 
   IF[{- $disabled{shared} -}]
     PROGRAMS_NO_INST=cipher_overhead_test
-    SOURCE[cipher_overhead_test]=cipher_overhead_test.c
+    SOURCE[cipher_overhead_test]=cipher_overhead_test.c testutil.c test_main.c
     INCLUDE[cipher_overhead_test]=.. ../include
     DEPEND[cipher_overhead_test]=../libcrypto ../libssl
   ENDIF
@@ -308,15 +321,19 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[uitest]=.. ../include
   DEPEND[uitest]=../libcrypto ../libssl
 
-  SOURCE[cipherbytes_test]=cipherbytes_test.c
+  SOURCE[cipherbytes_test]=cipherbytes_test.c testutil.c test_main_custom.c
   INCLUDE[cipherbytes_test]=.. ../include
   DEPEND[cipherbytes_test]=../libcrypto ../libssl
 
+  SOURCE[asn1_encode_test]=asn1_encode_test.c testutil.c test_main.c
+  INCLUDE[asn1_encode_test]=../include
+  DEPEND[asn1_encode_test]=../libcrypto
+
   # 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 forcebly linked with the static libraries, where all symbols
+  # 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.
@@ -326,6 +343,9 @@ IF[{- !$disabled{tests} -}]
     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
@@ -334,6 +354,10 @@ IF[{- !$disabled{tests} -}]
     INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
     DEPEND[poly1305_internal_test]=../libcrypto.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[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