summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicola Tuveri <nic.tuv@gmail.com>2021-08-21 04:04:51 +0300
committerNicola Tuveri <nic.tuv@gmail.com>2021-08-30 15:18:29 +0300
commit78082769fa8129e3453ee4cb2255feb259846646 (patch)
treeb9e1bf6547d1f42388c9990a35ce28b50f1cb28d
parent7aa3dfc42104588f65301d20324388ac2c9a6b11 (diff)
Use applink to fix windows tests
(readapted from 5c69c66a6972f84d56160c9ea4b30bab8fc2d3d4 by @bernd-edlinger) Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16355)
-rw-r--r--test/build.info7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/build.info b/test/build.info
index dab5af4ebe..2e209b45c7 100644
--- a/test/build.info
+++ b/test/build.info
@@ -12,6 +12,11 @@ ENDIF
IF[{- $config{target} =~ /^vms-/ -}]
$AUXLIBAPPSSRC=../apps/lib/vms_term_sock.c ../apps/lib/vms_decc_argv.c
ENDIF
+# Program init source, that don't have direct linkage with the rest of the
+# source, and can therefore not be part of a library.
+IF[{- !$disabled{uplink} -}]
+ $INITSRC=../ms/applink.c
+ENDIF
$LIBAPPSSRC=../apps/lib/opt.c $AUXLIBAPPSSRC
IF[{- !$disabled{tests} -}]
@@ -712,7 +717,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[rc5test]=../include ../apps/include
DEPEND[rc5test]=../libcrypto.a libtestutil.a
- SOURCE[ec_internal_test]=ec_internal_test.c
+ SOURCE[ec_internal_test]=ec_internal_test.c $INITSRC
INCLUDE[ec_internal_test]=../include ../crypto/ec ../apps/include
DEPEND[ec_internal_test]=../libcrypto.a libtestutil.a