Adapt all test programs

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3243)

70 files changed, 151 insertions, 244 deletions

diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index a24b284866..7d762ae3c2 100644
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -13,7 +13,6 @@
 #include <openssl/rand.h>
 #include <openssl/asn1t.h>
 #include "internal/numbers.h"
-#include "test_main.h"
 #include "testutil.h"
 
 #ifdef __GNUC__
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index f936098cd9..f9fdeefed9 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -15,7 +15,6 @@
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
-#include "test_main.h"
 #include "testutil.h"
 #include "e_os.h"
 
diff --git a/test/asynciotest.c b/test/asynciotest.c
index f78b86f2a7..ee450dafd3 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -17,7 +17,6 @@
 
 #include "ssltestlib.h"
 #include "testutil.h"
-#include "test_main_custom.h"
 
 /* Should we fragment records or not? 0 = no, !0 = yes*/
 static int fragment = 0;
diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 0bfbebf7e1..9745ff8720 100644
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -41,7 +41,6 @@
 #include "../ssl/packet_locl.h"
 #include "../e_os.h" /* for OSSL_NELEM() */
 
-#include "test_main.h"
 #include "testutil.h"
 
 /* For DTLS1_BAD_VER packets the MAC doesn't include the handshake header */
diff --git a/test/bftest.c b/test/bftest.c
index eea9fcb7b9..a7e0bf1cd1 100644
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
 
-#include "test_main_custom.h"
 #include "testutil.h"
 
 #include "../e_os.h"
diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c
index 9b0dd6def1..bc49a7992a 100644
--- a/test/bio_enc_test.c
+++ b/test/bio_enc_test.c
@@ -12,7 +12,6 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
-#include "test_main.h"
 #include "testutil.h"
 
 #define ENCRYPT  1
diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index ca0f1aadf6..418d6e4c8d 100644
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -12,8 +12,6 @@
 #include <openssl/bio.h>
 #include "internal/numbers.h"
 #include "testutil.h"
-#include "test_main.h"
-#include "test_main_custom.h"
 
 #define nelem(x) (int)(sizeof(x) / sizeof((x)[0]))
 
diff --git a/test/bntest.c b/test/bntest.c
index 449b3a4fd2..0410e07d08 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -19,7 +19,6 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include "testutil.h"
-#include "test_main_custom.h"
 
 /*
  * In bn_lcl.h, bn_expand() is defined as a static ossl_inline function.
diff --git a/test/build.info b/test/build.info
index d17a4b087b..83a83c4497 100644
--- a/test/build.info
+++ b/test/build.info
@@ -47,270 +47,270 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
   INCLUDE[aborttest]=../include
   DEPEND[aborttest]=../libcrypto
 
-  SOURCE[sanitytest]=sanitytest.c testutil.c test_main.c
+  SOURCE[sanitytest]=sanitytest.c
   INCLUDE[sanitytest]=../include
-  DEPEND[sanitytest]=../libcrypto
+  DEPEND[sanitytest]=../libcrypto libtestutil.a
 
-  SOURCE[test_test]=test_test.c testutil.c test_main.c
+  SOURCE[test_test]=test_test.c
   INCLUDE[test_test]=.. ../include
-  DEPEND[test_test]=../libcrypto
+  DEPEND[test_test]=../libcrypto libtestutil.a
 
-  SOURCE[exdatatest]=exdatatest.c testutil.c test_main.c
+  SOURCE[exdatatest]=exdatatest.c
   INCLUDE[exdatatest]=../include
-  DEPEND[exdatatest]=../libcrypto
+  DEPEND[exdatatest]=../libcrypto libtestutil.a
 
-  SOURCE[bntest]=bntest.c testutil.c test_main_custom.c
+  SOURCE[bntest]=bntest.c
   INCLUDE[bntest]=.. ../crypto/include ../include
-  DEPEND[bntest]=../libcrypto
+  DEPEND[bntest]=../libcrypto libtestutil.a
 
   SOURCE[ectest]=ectest.c
   INCLUDE[ectest]=.. ../include
   DEPEND[ectest]=../libcrypto
 
-  SOURCE[ecdsatest]=ecdsatest.c testutil.c test_main.c
+  SOURCE[ecdsatest]=ecdsatest.c
   INCLUDE[ecdsatest]=../include
-  DEPEND[ecdsatest]=../libcrypto
+  DEPEND[ecdsatest]=../libcrypto libtestutil.a
 
-  SOURCE[gmdifftest]=gmdifftest.c testutil.c test_main.c
+  SOURCE[gmdifftest]=gmdifftest.c
   INCLUDE[gmdifftest]=../include
-  DEPEND[gmdifftest]=../libcrypto
+  DEPEND[gmdifftest]=../libcrypto libtestutil.a
 
-  SOURCE[pbelutest]=pbelutest.c testutil.c test_main.c
+  SOURCE[pbelutest]=pbelutest.c
   INCLUDE[pbelutest]=../include
-  DEPEND[pbelutest]=../libcrypto
+  DEPEND[pbelutest]=../libcrypto libtestutil.a
 
-  SOURCE[ideatest]=ideatest.c testutil.c test_main.c
+  SOURCE[ideatest]=ideatest.c
   INCLUDE[ideatest]=../include
-  DEPEND[ideatest]=../libcrypto
+  DEPEND[ideatest]=../libcrypto libtestutil.a
 
-  SOURCE[md2test]=md2test.c testutil.c test_main.c
+  SOURCE[md2test]=md2test.c
   INCLUDE[md2test]=../include
-  DEPEND[md2test]=../libcrypto
+  DEPEND[md2test]=../libcrypto libtestutil.a
 
-  SOURCE[hmactest]=hmactest.c testutil.c test_main.c
+  SOURCE[hmactest]=hmactest.c
   INCLUDE[hmactest]=../include
-  DEPEND[hmactest]=../libcrypto
+  DEPEND[hmactest]=../libcrypto libtestutil.a
 
-  SOURCE[rc2test]=rc2test.c testutil.c test_main.c
+  SOURCE[rc2test]=rc2test.c
   INCLUDE[rc2test]=../include
-  DEPEND[rc2test]=../libcrypto
+  DEPEND[rc2test]=../libcrypto libtestutil.a
 
-  SOURCE[rc4test]=rc4test.c testutil.c test_main.c
+  SOURCE[rc4test]=rc4test.c
   INCLUDE[rc4test]=../include
-  DEPEND[rc4test]=../libcrypto
+  DEPEND[rc4test]=../libcrypto libtestutil.a
 
-  SOURCE[rc5test]=rc5test.c testutil.c test_main.c
+  SOURCE[rc5test]=rc5test.c
   INCLUDE[rc5test]=../include
-  DEPEND[rc5test]=../libcrypto
+  DEPEND[rc5test]=../libcrypto libtestutil.a
 
-  SOURCE[destest]=destest.c testutil.c test_main.c
+  SOURCE[destest]=destest.c
   INCLUDE[destest]=../include
-  DEPEND[destest]=../libcrypto
+  DEPEND[destest]=../libcrypto libtestutil.a
 
-  SOURCE[sha1test]=sha1test.c testutil.c test_main.c
+  SOURCE[sha1test]=sha1test.c
   INCLUDE[sha1test]=../include
-  DEPEND[sha1test]=../libcrypto
+  DEPEND[sha1test]=../libcrypto libtestutil.a
 
-  SOURCE[sha256t]=sha256t.c testutil.c test_main.c
+  SOURCE[sha256t]=sha256t.c
   INCLUDE[sha256t]=../include
-  DEPEND[sha256t]=../libcrypto
+  DEPEND[sha256t]=../libcrypto libtestutil.a
 
-  SOURCE[sha512t]=sha512t.c testutil.c test_main.c
+  SOURCE[sha512t]=sha512t.c
   INCLUDE[sha512t]=../include
-  DEPEND[sha512t]=../libcrypto
+  DEPEND[sha512t]=../libcrypto libtestutil.a
 
-  SOURCE[mdc2test]=mdc2test.c testutil.c test_main.c
+  SOURCE[mdc2test]=mdc2test.c
   INCLUDE[mdc2test]=../include
-  DEPEND[mdc2test]=../libcrypto
+  DEPEND[mdc2test]=../libcrypto libtestutil.a
 
-  SOURCE[randtest]=randtest.c testutil.c test_main.c
+  SOURCE[randtest]=randtest.c
   INCLUDE[randtest]=../include
-  DEPEND[randtest]=../libcrypto
+  DEPEND[randtest]=../libcrypto libtestutil.a
 
-  SOURCE[dhtest]=dhtest.c testutil.c test_main.c
+  SOURCE[dhtest]=dhtest.c
   INCLUDE[dhtest]=.. ../include
-  DEPEND[dhtest]=../libcrypto
+  DEPEND[dhtest]=../libcrypto libtestutil.a
 
-  SOURCE[enginetest]=enginetest.c testutil.c test_main.c
+  SOURCE[enginetest]=enginetest.c
   INCLUDE[enginetest]=../include
-  DEPEND[enginetest]=../libcrypto
+  DEPEND[enginetest]=../libcrypto libtestutil.a
 
-  SOURCE[casttest]=casttest.c testutil.c test_main.c
+  SOURCE[casttest]=casttest.c
   INCLUDE[casttest]=.. ../include
-  DEPEND[casttest]=../libcrypto
+  DEPEND[casttest]=../libcrypto libtestutil.a
 
-  SOURCE[bftest]=bftest.c testutil.c test_main_custom.c
+  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 testutil.c test_main.c
+  SOURCE[dsatest]=dsatest.c
   INCLUDE[dsatest]=.. ../include
-  DEPEND[dsatest]=../libcrypto
+  DEPEND[dsatest]=../libcrypto libtestutil.a
 
   SOURCE[exptest]=exptest.c
   INCLUDE[exptest]=../include
   DEPEND[exptest]=../libcrypto
 
-  SOURCE[rsa_test]=rsa_test.c testutil.c test_main.c
+  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
   DEPEND[evp_test]=../libcrypto
 
-  SOURCE[evp_extra_test]=evp_extra_test.c testutil.c test_main.c
+  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 testutil.c test_main.c
+  SOURCE[v3nametest]=v3nametest.c
   INCLUDE[v3nametest]=.. ../include
-  DEPEND[v3nametest]=../libcrypto
+  DEPEND[v3nametest]=../libcrypto libtestutil.a
 
-  SOURCE[crltest]=crltest.c testutil.c test_main.c
+  SOURCE[crltest]=crltest.c
   INCLUDE[crltest]=../include
-  DEPEND[crltest]=../libcrypto
+  DEPEND[crltest]=../libcrypto libtestutil.a
 
-  SOURCE[v3ext]=v3ext.c testutil.c test_main_custom.c
+  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[constant_time_test]=constant_time_test.c testutil.c test_main.c
+  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 testutil.c test_main_custom.c
+  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 testutil.c test_main_custom.c
+  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 testutil.c test_main.c
+  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 testutil.c test_main.c
+  SOURCE[packettest]=packettest.c
   INCLUDE[packettest]=../include
-  DEPEND[packettest]=../libcrypto
+  DEPEND[packettest]=../libcrypto libtestutil.a
 
   SOURCE[asynctest]=asynctest.c
   INCLUDE[asynctest]=.. ../include
   DEPEND[asynctest]=../libcrypto
 
-  SOURCE[secmemtest]=secmemtest.c testutil.c test_main.c
+  SOURCE[secmemtest]=secmemtest.c
   INCLUDE[secmemtest]=../include
-  DEPEND[secmemtest]=../libcrypto
+  DEPEND[secmemtest]=../libcrypto libtestutil.a
 
-  SOURCE[srptest]=srptest.c testutil.c test_main.c
+  SOURCE[srptest]=srptest.c
   INCLUDE[srptest]=../include
-  DEPEND[srptest]=../libcrypto
+  DEPEND[srptest]=../libcrypto libtestutil.a
 
-  SOURCE[memleaktest]=memleaktest.c testutil.c
+  SOURCE[memleaktest]=memleaktest.c
   INCLUDE[memleaktest]=../include
-  DEPEND[memleaktest]=../libcrypto
+  DEPEND[memleaktest]=../libcrypto libtestutil.a
 
-  SOURCE[stack_test]=stack_test.c testutil.c test_main.c
+  SOURCE[stack_test]=stack_test.c
   INCLUDE[stack_test]=.. ../include
-  DEPEND[stack_test]=../libcrypto
+  DEPEND[stack_test]=../libcrypto libtestutil.a
 
-  SOURCE[lhash_test]=lhash_test.c testutil.c test_main.c
+  SOURCE[lhash_test]=lhash_test.c
   INCLUDE[lhash_test]=.. ../include
-  DEPEND[lhash_test]=../libcrypto
+  DEPEND[lhash_test]=../libcrypto libtestutil.a
 
   SOURCE[dtlsv1listentest]=dtlsv1listentest.c
   INCLUDE[dtlsv1listentest]=.. ../include
   DEPEND[dtlsv1listentest]=../libssl
 
-  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 testutil.c test_main.c
+  SOURCE[threadstest]=threadstest.c
   INCLUDE[threadstest]=.. ../include
-  DEPEND[threadstest]=../libcrypto
+  DEPEND[threadstest]=../libcrypto libtestutil.a
 
-  SOURCE[afalgtest]=afalgtest.c testutil.c
+  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 ../libssl
+  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
 
-  SOURCE[x509aux]=x509aux.c testutil.c test_main_custom.c
+  SOURCE[x509aux]=x509aux.c
   INCLUDE[x509aux]=.. ../include
-  DEPEND[x509aux]=../libcrypto
+  DEPEND[x509aux]=../libcrypto libtestutil.a
 
-  SOURCE[asynciotest]=asynciotest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[asynciotest]=asynciotest.c ssltestlib.c
   INCLUDE[asynciotest]=../include
-  DEPEND[asynciotest]=../libcrypto ../libssl
+  DEPEND[asynciotest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[bioprinttest]=bioprinttest.c testutil.c test_main_custom.c
+  SOURCE[bioprinttest]=bioprinttest.c
   INCLUDE[bioprinttest]=../ ../include
-  DEPEND[bioprinttest]=../libcrypto
+  DEPEND[bioprinttest]=../libcrypto libtestutil.a
 
-  SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[sslapitest]=sslapitest.c ssltestlib.c
   INCLUDE[sslapitest]=../include ..
-  DEPEND[sslapitest]=../libcrypto ../libssl
+  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 testutil.c test_main_custom.c
+  SOURCE[sslcorrupttest]=sslcorrupttest.c ssltestlib.c
   INCLUDE[sslcorrupttest]=../include .
-  DEPEND[sslcorrupttest]=../libcrypto ../libssl
+  DEPEND[sslcorrupttest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[bio_enc_test]=bio_enc_test.c testutil.c test_main.c
+  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 testutil.c test_main.c
+  SOURCE[pkey_meth_test]=pkey_meth_test.c
   INCLUDE[pkey_meth_test]=../include
-  DEPEND[pkey_meth_test]=../libcrypto
+  DEPEND[pkey_meth_test]=../libcrypto libtestutil.a
 
-  SOURCE[x509_time_test]=x509_time_test.c testutil.c test_main.c
+  SOURCE[x509_time_test]=x509_time_test.c
   INCLUDE[x509_time_test]=.. ../include
-  DEPEND[x509_time_test]=../libcrypto
+  DEPEND[x509_time_test]=../libcrypto libtestutil.a
 
-  SOURCE[recordlentest]=recordlentest.c ssltestlib.c testutil.c test_main_custom.c
+  SOURCE[recordlentest]=recordlentest.c ssltestlib.c
   INCLUDE[recordlentest]=../include .
-  DEPEND[recordlentest]=../libcrypto ../libssl
+  DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c testutil.c test_main_custom.c
+  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
   INCLUDE[x509_dup_cert_test]=.