Commit e463cb39 authored by Matt Caswell's avatar Matt Caswell
Browse files

Enable wpacket test on shared builds 



Now that we support internal tests properly, we can test wpacket even in
shared builds.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
parent 2c0980d2

test/build.info

+6 −6
Original line number Diff line number Diff line
@@ -309,11 +309,7 @@ IF[{- !$disabled{tests} -}] 
  ENDIF



  IF[{- $disabled{shared} -}]

    PROGRAMS_NO_INST=wpackettest cipher_overhead_test

    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c

    INCLUDE[wpackettest]=../include

    DEPEND[wpackettest]=../libcrypto ../libssl



    PROGRAMS_NO_INST=cipher_overhead_test

    SOURCE[cipher_overhead_test]=cipher_overhead_test.c

    INCLUDE[cipher_overhead_test]=.. ../include

    DEPEND[cipher_overhead_test]=../libcrypto ../libssl
@@ -334,7 +330,7 @@ IF[{- !$disabled{tests} -}] 
  # names with the DLL import libraries.

  IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}]

    PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \

                     tls13encryptiontest

                     tls13encryptiontest wpackettest

    IF[{- !$disabled{poly1305} -}]

      PROGRAMS_NO_INST=poly1305_internal_test

    ENDIF
@@ -358,6 +354,10 @@ IF[{- !$disabled{tests} -}] 
    SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c

    INCLUDE[tls13encryptiontest]=.. ../include

    DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a



    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c

    INCLUDE[wpackettest]=../include

    DEPEND[wpackettest]=../libcrypto ../libssl.a

  ENDIF



  IF[{- !$disabled{mdc2} -}]

test/recipes/70-test_wpacket.t

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ use OpenSSL::Test::Utils; 


setup("test_wpacket");



plan skip_all => "Only supported in no-shared builds"

    if !disabled("shared");

plan skip_all => "Test disabled in this configuration"

    if $^O eq 'MSWin32' && !disabled("shared");



plan tests => 1;