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

diff --git a/test/build.info b/test/build.info
index fce00986e3..4525362a08 100644
--- a/test/build.info
+++ b/test/build.info
@@ -13,7 +13,7 @@ IF[{- !$disabled{tests} -}]
   PROGRAMS_NO_INST=\
           aborttest test_test \
           sanitytest exdatatest bntest \
-          ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
+          ectest ecdsatest gmdifftest pbelutest ideatest \
           md2test \
           hmactest \
           rc2test rc4test rc5test \
@@ -35,7 +35,7 @@ IF[{- !$disabled{tests} -}]
   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
 
@@ -55,19 +55,15 @@ 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 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
 
@@ -79,7 +75,7 @@ IF[{- !$disabled{tests} -}]
   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
 
@@ -95,7 +91,7 @@ IF[{- !$disabled{tests} -}]
   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
 
@@ -115,20 +111,20 @@ IF[{- !$disabled{tests} -}]
   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 testutil.c test_main_custom.c
@@ -139,8 +135,8 @@ 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
@@ -155,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
 
@@ -163,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
 
@@ -179,11 +175,11 @@ 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
 
@@ -195,7 +191,7 @@ IF[{- !$disabled{tests} -}]
   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
 
@@ -207,7 +203,7 @@ IF[{- !$disabled{tests} -}]
   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
 
@@ -231,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
 
@@ -260,16 +256,16 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[handshake_helper.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 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
@@ -280,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
 
@@ -315,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
@@ -325,7 +321,7 @@ 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
 
@@ -358,7 +354,7 @@ IF[{- !$disabled{tests} -}]
     INCLUDE[poly1305_internal_test]=.. ../include ../crypto/include
     DEPEND[poly1305_internal_test]=../libcrypto.a
 
-    SOURCE[chacha_internal_test]=chacha_internal_test.c
+    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