提交 e463cb39 编写于 作者: M Matt Caswell

Enable wpacket test on shared builds

Now that we support internal tests properly, we can test wpacket even in
shared builds.
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
上级 2c0980d2
...@@ -309,11 +309,7 @@ IF[{- !$disabled{tests} -}] ...@@ -309,11 +309,7 @@ IF[{- !$disabled{tests} -}]
ENDIF ENDIF
IF[{- $disabled{shared} -}] IF[{- $disabled{shared} -}]
PROGRAMS_NO_INST=wpackettest cipher_overhead_test PROGRAMS_NO_INST=cipher_overhead_test
SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
INCLUDE[wpackettest]=../include
DEPEND[wpackettest]=../libcrypto ../libssl
SOURCE[cipher_overhead_test]=cipher_overhead_test.c SOURCE[cipher_overhead_test]=cipher_overhead_test.c
INCLUDE[cipher_overhead_test]=.. ../include INCLUDE[cipher_overhead_test]=.. ../include
DEPEND[cipher_overhead_test]=../libcrypto ../libssl DEPEND[cipher_overhead_test]=../libcrypto ../libssl
...@@ -334,7 +330,7 @@ IF[{- !$disabled{tests} -}] ...@@ -334,7 +330,7 @@ IF[{- !$disabled{tests} -}]
# names with the DLL import libraries. # names with the DLL import libraries.
IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}] IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}]
PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \ PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \
tls13encryptiontest tls13encryptiontest wpackettest
IF[{- !$disabled{poly1305} -}] IF[{- !$disabled{poly1305} -}]
PROGRAMS_NO_INST=poly1305_internal_test PROGRAMS_NO_INST=poly1305_internal_test
ENDIF ENDIF
...@@ -358,6 +354,10 @@ IF[{- !$disabled{tests} -}] ...@@ -358,6 +354,10 @@ IF[{- !$disabled{tests} -}]
SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c
INCLUDE[tls13encryptiontest]=.. ../include INCLUDE[tls13encryptiontest]=.. ../include
DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a
SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
INCLUDE[wpackettest]=../include
DEPEND[wpackettest]=../libcrypto ../libssl.a
ENDIF ENDIF
IF[{- !$disabled{mdc2} -}] IF[{- !$disabled{mdc2} -}]
......
...@@ -12,8 +12,8 @@ use OpenSSL::Test::Utils; ...@@ -12,8 +12,8 @@ use OpenSSL::Test::Utils;
setup("test_wpacket"); setup("test_wpacket");
plan skip_all => "Only supported in no-shared builds" plan skip_all => "Test disabled in this configuration"
if !disabled("shared"); if $^O eq 'MSWin32' && !disabled("shared");
plan tests => 1; plan tests => 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册