Make test/uitest depend on the private apps support library This avoids having to enumerate specific modules in apps, or to have to include them in libtestutil.a. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5222)
diff --git a/test/build.info b/test/build.info index f91800a..c3c7f1e 100644 --- a/test/build.info +++ b/test/build.info
@@ -12,7 +12,6 @@ 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 \ - {- rebase_files("../apps", $target{apps_aux_src}) -} \ testutil/test_cleanup.c testutil/main.c testutil/init.c INCLUDE[libtestutil.a]=../include DEPEND[libtestutil.a]=../libcrypto @@ -369,9 +368,11 @@ DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a ENDIF - SOURCE[uitest]=uitest.c ../apps/apps.c ../apps/opt.c + SOURCE[uitest]=uitest.c \ + {- rebase_files("../apps", + split(/\s+/, $target{apps_init_src})) -} INCLUDE[uitest]=.. ../include ../apps - DEPEND[uitest]=../libcrypto ../libssl libtestutil.a + DEPEND[uitest]=../apps/libapps.a ../libcrypto ../libssl libtestutil.a SOURCE[cipherbytes_test]=cipherbytes_test.c INCLUDE[cipherbytes_test]=../include