X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fbuild.info;h=2b429d304cd9c732ad556076a3068816115b2f44;hb=f3fdfbf78c6bfc97abf9c70b03859a28ebf6b66d;hp=e38f1422591b9634cd96b3fd3a69be2bf180ec8c;hpb=0d345f0e10b14392925479fc61b6c9072a9605a3;p=oweals%2Fopenssl.git diff --git a/test/build.info b/test/build.info index e38f142259..2b429d304c 100644 --- a/test/build.info +++ b/test/build.info @@ -1,32 +1,34 @@ SUBDIRS=ossl_shim -# TODO: use ../apps/libapps.a instead of direct ../apps source. +# TODO: use ../apps/libapps.a instead of direct ../apps/lib source. # This can't currently be done, because some of its units drag in too many -# unresolved references that don't apply here. Most of all, ../apps/apps.c -# needs to be divided in smaller pieces to be useful here. +# unresolved references that don't apply here. +# Most of all, ../apps/lib/apps.c needs to be divided in smaller pieces to +# be useful here. # -# Auxilliary program source (copied from ../apps/build.info) +# Auxiliary program source (copied from ../apps/build.info) IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}] # It's called 'init', but doesn't have much 'init' in it... - $AUXLIBAPPSSRC=../apps/win32_init.c + $AUXLIBAPPSSRC=../apps/lib/win32_init.c ENDIF IF[{- $config{target} =~ /^vms-/ -}] - $AUXLIBAPPSSRC=../apps/vms_term_sock.c ../apps/vms_decc_argv.c + $AUXLIBAPPSSRC=../apps/lib/vms_term_sock.c ../apps/lib/vms_decc_argv.c ENDIF -$LIBAPPSSRC=../apps/opt.c ../apps/bf_prefix.c $AUXLIBAPPSSRC +$LIBAPPSSRC=../apps/lib/opt.c $AUXLIBAPPSSRC IF[{- !$disabled{tests} -}] LIBS{noinst,has_main}=libtestutil.a SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \ testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \ testutil/format_output.c testutil/tap_bio.c \ - testutil/test_cleanup.c testutil/main.c testutil/init.c \ + testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \ testutil/options.c testutil/test_options.c \ - testutil/apps_mem.c $LIBAPPSSRC + testutil/apps_mem.c testutil/random.c $LIBAPPSSRC INCLUDE[libtestutil.a]=../include ../apps/include .. DEPEND[libtestutil.a]=../libcrypto PROGRAMS{noinst}=\ + confdump \ versions \ aborttest test_test \ sanitytest rsa_complex exdatatest bntest \ @@ -37,14 +39,15 @@ IF[{- !$disabled{tests} -}] destest mdc2test \ dhtest enginetest casttest \ bftest ssltest_old dsatest dsa_no_digest_size_test exptest rsa_test \ - evp_test evp_extra_test igetest v3nametest v3ext \ + evp_pkey_provided_test evp_test evp_extra_test evp_fetch_prov_test \ + igetest v3nametest v3ext \ crltest danetest bad_dtls_test lhash_test sparse_array_test \ conf_include_test params_api_test params_conversion_test \ constant_time_test verify_extra_test clienthellotest \ packettest asynctest secmemtest srptest memleaktest stack_test \ dtlsv1listentest ct_test threadstest afalgtest d2i_test \ ssl_test_ctx_test ssl_test x509aux cipherlist_test asynciotest \ - bio_callback_test bio_memleak_test \ + bio_callback_test bio_memleak_test param_build_test \ bioprinttest sslapitest dtlstest sslcorrupttest bio_enc_test \ pkey_meth_test pkey_meth_kdf_test evp_kdf_test uitest \ cipherbytes_test \ @@ -54,8 +57,13 @@ IF[{- !$disabled{tests} -}] recordlentest drbgtest drbg_cavs_test sslbuffertest \ time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \ servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \ - sysdefaulttest errtest gosttest \ - context_internal_test aesgcmtest params_test evp_pkey_dparams_test + sysdefaulttest errtest ssl_ctx_test gosttest \ + context_internal_test aesgcmtest params_test evp_pkey_dparams_test \ + keymgmt_internal_test + + SOURCE[confdump]=confdump.c + INCLUDE[confdump]=../include ../apps/include + DEPEND[confdump]=../libcrypto SOURCE[versions]=versions.c INCLUDE[versions]=../include ../apps/include @@ -174,7 +182,7 @@ IF[{- !$disabled{tests} -}] SOURCE[rsa_mp_test]=rsa_mp_test.c INCLUDE[rsa_mp_test]=../include ../apps/include - DEPEND[rsa_mp_test]=../libcrypto libtestutil.a + DEPEND[rsa_mp_test]=../libcrypto.a libtestutil.a SOURCE[fatalerrtest]=fatalerrtest.c ssltestlib.c INCLUDE[fatalerrtest]=../include ../apps/include @@ -194,10 +202,18 @@ IF[{- !$disabled{tests} -}] SOURCE[evp_extra_test]=evp_extra_test.c INCLUDE[evp_extra_test]=../include ../apps/include ../crypto/include DEPEND[evp_extra_test]=../libcrypto libtestutil.a + + SOURCE[evp_fetch_prov_test]=evp_fetch_prov_test.c + INCLUDE[evp_fetch_prov_test]=../include ../apps/include ../crypto/include + DEPEND[evp_fetch_prov_test]=../libcrypto libtestutil.a IF[{- $disabled{fips} || !$target{dso_scheme} -}] DEFINE[evp_extra_test]=NO_FIPS_MODULE ENDIF + SOURCE[evp_pkey_provided_test]=evp_pkey_provided_test.c + INCLUDE[evp_pkey_provided_test]=../include ../apps/include + DEPEND[evp_pkey_provided_test]=../libcrypto libtestutil.a + SOURCE[igetest]=igetest.c INCLUDE[igetest]=../include ../apps/include DEPEND[igetest]=../libcrypto libtestutil.a @@ -297,6 +313,7 @@ IF[{- !$disabled{tests} -}] INCLUDE[ssl_test_ctx.o]=../include INCLUDE[handshake_helper.o]=.. ../include INCLUDE[ssltestlib.o]=.. ../include + INCLUDE[cmp_testlib.o]=.. ../include ../apps/include SOURCE[x509aux]=x509aux.c INCLUDE[x509aux]=../include ../apps/include @@ -326,6 +343,10 @@ IF[{- !$disabled{tests} -}] INCLUDE[params_conversion_test]=../include ../apps/include DEPEND[params_conversion_test]=../libcrypto libtestutil.a + SOURCE[param_build_test]=param_build_test.c + INCLUDE[param_build_test]=../include ../apps/include + DEPEND[param_build_test]=../libcrypto.a libtestutil.a + SOURCE[sslapitest]=sslapitest.c ssltestlib.c INCLUDE[sslapitest]=../include ../apps/include .. DEPEND[sslapitest]=../libcrypto ../libssl libtestutil.a @@ -424,14 +445,14 @@ IF[{- !$disabled{tests} -}] INCLUDE[shlibloadtest]=../include ../apps/include ../crypto/include ENDIF - IF[{- $disabled{shared} -}] - PROGRAMS{noinst}=cipher_overhead_test - SOURCE[cipher_overhead_test]=cipher_overhead_test.c - INCLUDE[cipher_overhead_test]=.. ../include ../apps/include - DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a - ENDIF + # cipher_overhead_test uses internal symbols, so it must be linked with + # the static libraries + PROGRAMS{noinst}=cipher_overhead_test + SOURCE[cipher_overhead_test]=cipher_overhead_test.c + INCLUDE[cipher_overhead_test]=.. ../include ../apps/include + DEPEND[cipher_overhead_test]=../libcrypto.a ../libssl.a libtestutil.a - SOURCE[uitest]=uitest.c ../apps/apps_ui.c + SOURCE[uitest]=uitest.c ../apps/lib/apps_ui.c INCLUDE[uitest]=.. ../include ../apps/include DEPEND[uitest]=../libcrypto ../libssl libtestutil.a @@ -459,6 +480,35 @@ IF[{- !$disabled{tests} -}] INCLUDE[conf_include_test]=../include ../apps/include DEPEND[conf_include_test]=../libcrypto libtestutil.a + IF[{- !$disabled{cmp} -}] + PROGRAMS{noinst}=cmp_asn_test cmp_ctx_test cmp_status_test cmp_hdr_test \ + cmp_protect_test cmp_msg_test + ENDIF + + SOURCE[cmp_asn_test]=cmp_asn_test.c cmp_testlib.c + INCLUDE[cmp_asn_test]=.. ../include ../apps/include + DEPEND[cmp_asn_test]=../libcrypto.a libtestutil.a + + SOURCE[cmp_ctx_test]=cmp_ctx_test.c cmp_testlib.c + INCLUDE[cmp_ctx_test]=.. ../include ../apps/include + DEPEND[cmp_ctx_test]=../libcrypto.a libtestutil.a + + SOURCE[cmp_hdr_test]=cmp_hdr_test.c cmp_testlib.c + INCLUDE[cmp_hdr_test]=.. ../include ../apps/include + DEPEND[cmp_hdr_test]=../libcrypto.a libtestutil.a + + SOURCE[cmp_status_test]=cmp_status_test.c cmp_testlib.c + INCLUDE[cmp_status_test]=.. ../include ../apps/include + DEPEND[cmp_status_test]=../libcrypto.a libtestutil.a + + SOURCE[cmp_protect_test]=cmp_status_test.c cmp_testlib.c + INCLUDE[cmp_protect_test]=.. ../include ../apps/include + DEPEND[cmp_protect_test]=../libcrypto.a libtestutil.a + + SOURCE[cmp_msg_test]=cmp_status_test.c cmp_testlib.c + INCLUDE[cmp_msg_test]=.. ../include ../apps/include + DEPEND[cmp_msg_test]=../libcrypto.a 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 @@ -504,7 +554,7 @@ IF[{- !$disabled{tests} -}] DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a SOURCE[modes_internal_test]=modes_internal_test.c - INCLUDE[modes_internal_test]=.. ../include ../apps/include + INCLUDE[modes_internal_test]=.. ../include ../apps/include ../crypto/include DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a SOURCE[x509_internal_test]=x509_internal_test.c @@ -524,7 +574,7 @@ IF[{- !$disabled{tests} -}] DEPEND[property_test]=../libcrypto.a libtestutil.a SOURCE[ctype_internal_test]=ctype_internal_test.c - INCLUDE[ctype_internal_test]=.. ../crypto/include ../include ../apps/include + INCLUDE[ctype_internal_test]=.. ../include ../apps/include DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a SOURCE[sparse_array_test]=sparse_array_test.c @@ -556,16 +606,20 @@ IF[{- !$disabled{tests} -}] DEPEND[rdrand_sanitytest]=../libcrypto.a libtestutil.a SOURCE[rsa_sp800_56b_test]=rsa_sp800_56b_test.c - INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/include ../crypto/rsa ../apps/include + INCLUDE[rsa_sp800_56b_test]=.. ../include ../crypto/rsa ../apps/include DEPEND[rsa_sp800_56b_test]=../libcrypto.a libtestutil.a SOURCE[bn_internal_test]=bn_internal_test.c - INCLUDE[bn_internal_test]=.. ../include ../crypto/include ../crypto/bn ../apps/include + INCLUDE[bn_internal_test]=.. ../include ../crypto/bn ../apps/include DEPEND[bn_internal_test]=../libcrypto.a libtestutil.a SOURCE[asn1_dsa_internal_test]=asn1_dsa_internal_test.c INCLUDE[asn1_dsa_internal_test]=.. ../include ../apps/include ../crypto/include DEPEND[asn1_dsa_internal_test]=../libcrypto.a libtestutil.a + + SOURCE[keymgmt_internal_test]=keymgmt_internal_test.c + INCLUDE[keymgmt_internal_test]=.. ../include ../apps/include + DEPEND[keymgmt_internal_test]=../libcrypto.a libtestutil.a ENDIF IF[{- !$disabled{mdc2} -}] @@ -652,8 +706,17 @@ IF[{- !$disabled{tests} -}] SOURCE[namemap_internal_test]=namemap_internal_test.c INCLUDE[namemap_internal_test]=.. ../include ../apps/include DEPEND[namemap_internal_test]=../libcrypto.a libtestutil.a + + PROGRAMS{noinst}=bio_prefix_text + SOURCE[bio_prefix_text]=bio_prefix_text.c $LIBAPPSSRC + INCLUDE[bio_prefix_text]=.. ../include ../apps/include + DEPEND[bio_prefix_text]=../libcrypto ENDIF + SOURCE[ssl_ctx_test]=ssl_ctx_test.c + INCLUDE[ssl_ctx_test]=../include ../apps/include + DEPEND[ssl_ctx_test]=../libcrypto ../libssl libtestutil.a + {- use File::Spec::Functions; use File::Basename;