diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-01-30 18:18:34 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-31 16:19:49 +0100 |
| commit | 77550dbf7af4d31b915d076ee968cfc75e14a411 (patch) | |
| tree | 302c131420167fc91c08eb44c107fc619dce2f51 /test | |
| parent | d1dd5d6f4c2f13478aa45557b4546febd51f0cb3 (diff) | |
| download | openssl-77550dbf7af4d31b915d076ee968cfc75e14a411.tar.gz | |
Build cleanup: Remove the VMS hack from test/build.info
There was a hack specifically for VMS, which involved setting a make
variable to indicate that test/libtestutil contains a 'main'.
Instead, we use the new attributes 'has_main' to indicate this, and
let the VMS build file template fend with it appropriately.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8125)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/test/build.info b/test/build.info index a7d31d45da..c2be761a46 100644 --- a/test/build.info +++ b/test/build.info @@ -9,7 +9,7 @@ SUBDIRS=ossl_shim "" -} IF[{- !$disabled{tests} -}] - LIBS{noinst}=libtestutil.a + 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 \ @@ -17,13 +17,6 @@ IF[{- !$disabled{tests} -}] INCLUDE[libtestutil.a]=../include DEPEND[libtestutil.a]=../libcrypto - # Special hack for descrip.mms to include the MAIN object module - # explicitly. This will only be done if there isn't a 'main' in the - # program's object modules already. - BEGINRAW[descrip.mms] -INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=main - ENDRAW[descrip.mms] - PROGRAMS{noinst}=\ versions \ aborttest test_test \ |